diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-03-05 10:22:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-03-05 10:22:57 +0000 |
| commit | 2d8bccc9b30f687813d3366294a80fa6792ac4db (patch) | |
| tree | 710affa3a03a66766dc0f51e1c58d28b08608127 /setup-disk.in | |
| parent | c793c904f4b0312b2fcb11c3dc735e4232bc2070 (diff) | |
| download | alpine-conf-2d8bccc9b30f687813d3366294a80fa6792ac4db.tar.bz2 alpine-conf-2d8bccc9b30f687813d3366294a80fa6792ac4db.tar.xz | |
setup-disk: monor code cleanup
Make it a bit more clear what is going on by moving initialization
of mnt_boot to same place for both cases.
And remove redundant code line.
Thanks to Jim Pryor for pointing this out.
Diffstat (limited to 'setup-disk.in')
| -rw-r--r-- | setup-disk.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setup-disk.in b/setup-disk.in index ca586ba..6500ba7 100644 --- a/setup-disk.in +++ b/setup-disk.in @@ -162,7 +162,7 @@ find_pvs_in_vg() { } install_mounted_root() { - local mnt="$1" mnt_boot="$1" boot_fs= root_fs= + local mnt="$1" mnt_boot= boot_fs= root_fs= local initfs_features="ata base ide scsi usb virtio" local pvs= dev= rootdev= bootdev= raidopt= root= modules= local kernel_opts="quiet" @@ -185,9 +185,9 @@ install_mounted_root() { bootdev=$(find_mount_dev "$mnt"/boot) if [ -z "$bootdev" ]; then bootdev=$rootdev + mnt_boot="$mnt" else mnt_boot="$mnt"/boot - bootdev=$(find_mount_dev "$mnt_boot") fi boot_fs=$(find_mount_fs "$mnt_boot") supported_boot_fs "$boot_fs" || return 1 |