aboutsummaryrefslogtreecommitdiffstats
path: root/initramfs-init.in
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-04-08 14:40:19 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2015-04-08 14:54:09 +0200
commit9019409e64c5018dbe856728a90d39a764f7e1b2 (patch)
treec20d612476e8e18b88dd942b6f22a1387c40d1b5 /initramfs-init.in
parentf54348bcae4bffedb200d1b66a1cbf46acf7efce (diff)
downloadmkinitfs-9019409e64c5018dbe856728a90d39a764f7e1b2.tar.bz2
mkinitfs-9019409e64c5018dbe856728a90d39a764f7e1b2.tar.xz
init: clean up rootfstype and rootflags options
we can get rid of if/else with some shell variable expansions
Diffstat (limited to 'initramfs-init.in')
-rwxr-xr-xinitramfs-init.in20
1 files changed, 5 insertions, 15 deletions
diff --git a/initramfs-init.in b/initramfs-init.in
index 3d48f92..42ee63f 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -387,8 +387,8 @@ eval set -- `cat /proc/cmdline`
myopts="alpine_dev autodetect autoraid chart cryptroot cryptdm debug_init
dma init_args keep_apk_new modules ovl_dev pkgs quiet root_size root
- rootfstype rootflags usbdelay ip alpine_repo apkovl alpine_start
- splash blacklist overlaytmpfs"
+ usbdelay ip alpine_repo apkovl alpine_start splash blacklist
+ overlaytmpfs rootfstype rootflags"
for opt; do
case "$opt" in
@@ -551,20 +551,10 @@ if [ -n "$KOPT_root" ]; then
mount -t tmpfs root-tmpfs /media/root-rw
mkdir -p /media/root-rw/work /media/root-rw/root
mount -t overlay -o lowerdir=/media/root-ro,upperdir=/media/root-rw/root,workdir=/media/root-rw/work overlayfs $sysroot
- elif [ -n $KOPT_rootfstype ]; then
- if [ -n $KOPT_rootflags ]; then
- rootflags="$KOPT_rootflags"
- else
- rootflags="ro"
- fi
- retry_mount -t $KOPT_rootfstype -o $rootflags $KOPT_root $sysroot 2>/dev/null
else
- if [ -n $KOPT_rootflags ]; then
- rootflags="$KOPT_rootflags"
- else
- rootflags="ro"
- fi
- retry_mount -o $rootflags $KOPT_root $sysroot 2>/dev/null
+ retry_mount ${KOPT_rootfstype:+-t} ${KOPT_rootfstype} \
+ -o ${KOPT_rootflags:-ro} \
+ $KOPT_root $sysroot 2>/dev/null
fi
eend $?