summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-05-02 19:00:27 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-05-02 19:07:02 +0000
commit140d5130726f9c215fa15af877c1c4e445847497 (patch)
treef919526314743be3d460269badb4c6fc3fe455ea
parent051d24a922a3515f848e165fdccbe03941efc5c3 (diff)
downloadmkinitfs-master.tar.bz2
mkinitfs-master.tar.xz
init: use apkovl instead of ovl_dev boot option httpHEADmaster
Use the format: apkovl=http://<server>/path/host.apkovl.tar.gz when using apkovl from http.
-rwxr-xr-xinitramfs-init.in24
1 files changed, 12 insertions, 12 deletions
diff --git a/initramfs-init.in b/initramfs-init.in
index 2bc8439..5d07157 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -367,7 +367,7 @@ 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
- usbdelay ip alpine_repo"
+ usbdelay ip alpine_repo apkovl"
for opt; do
case "$opt" in
@@ -422,18 +422,18 @@ if [ "$ALPINE_DEV_FS" = "$ALPINE_DEV" ]; then
fi
# /dev/blah:ext3
+if [ -n "$KOPT_ovl_dev" ] ; then
+ OVL_DEV=${KOPT_ovl_dev%%:*}
+ OVL_DEV_FS=${KOPT_ovl_dev##*:}
+ if [ "$OVL_DEV_FS" = "$OVL_DEV" ]; then
+ unset OVL_DEV_FS
+ fi
+fi
+
# http://.../blah.apkovl.tar.gz
-case "$KOPT_ovl_dev" in
- '') ;;
- http://*|https://*|ftp://*)
- OVL_DEV="$KOPT_ovl_dev"
- ;;
- *:*)
- OVL_DEV="${KOPT_ovl_dev%%:*}"
- OVL_DEV_FS="${KOPT_ovl_dev##*:}"
- ;;
- *) OVL_DEV="${KOPT_ovl_dev}"
- ;;
+case "$KOPT_apkovl" in
+ http://*|https://|ftp://*)
+ OVL_DEV="$KOPT_apkovl";;
esac
case "$ALPINE_DEV" in