diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-20 09:22:06 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-20 09:22:06 +0000 |
commit | 6aba975e73e7cea833640e8db180c0add01ecf33 (patch) | |
tree | 258e71b68383108d4634e0546dbd0decb948695d /initramfs-init.in | |
parent | f9796dc318ddbf24f8f1fad67aeaea07fe416bd9 (diff) | |
parent | 3c0420ee47d4389f4e6b8faeb109b0901835898f (diff) | |
download | mkinitfs-6aba975e73e7cea833640e8db180c0add01ecf33.tar.bz2 mkinitfs-6aba975e73e7cea833640e8db180c0add01ecf33.tar.xz |
Merge branch 'master' into nlplug-findfs
Diffstat (limited to 'initramfs-init.in')
-rwxr-xr-x | initramfs-init.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/initramfs-init.in b/initramfs-init.in index eb3e290..4f1e659 100755 --- a/initramfs-init.in +++ b/initramfs-init.in @@ -445,9 +445,7 @@ if [ -f "$ovl" ]; then eend $? $errstr || ovlfiles= # hack, incase /root/.ssh was included in apkovl [ -d "$sysroot/root" ] && chmod 700 "$sysroot/root" - pkgs="$pkgs $(sed 's/\#.*//' $sysroot/etc/lbu/packages.list 2>/dev/null)" - pkgs="$pkgs $(cat $sysroot/var/lib/apk/world \ - $sysroot/etc/apk/world 2>/dev/null)" + pkgs="$pkgs $(cat $sysroot/etc/apk/world 2>/dev/null)" fi if [ -f "$sysroot/etc/.default_boot_services" -o ! -f "$ovl" ]; then @@ -558,11 +556,16 @@ if [ "$KOPT_keep_apk_new" != yes ]; then apkflags="$apkflags --clean-protected" [ -n "$ovlfiles" ] && apkflags="$apkflags --overlay-from-stdin" fi +mkdir -p $sysroot/sys $sysroot/proc $sysroot/dev +mount -o bind /sys $sysroot/sys +mount -o bind /proc $sysroot/proc +mount -o bind /dev $sysroot/dev if [ -n "$ovlfiles" ]; then apk add --root $sysroot $repo_opt $apkflags $pkgs <$ovlfiles else apk add --root $sysroot $repo_opt $apkflags $pkgs fi +umount $sysroot/sys $sysroot/proc $sysroot/dev eend $? # unmount ovl mount if needed |