diff options
Diffstat (limited to 'initramfs/initrd-stuff/init')
| -rwxr-xr-x | initramfs/initrd-stuff/init | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index b9f828b8..7dbbdad3 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -31,7 +31,6 @@ # certain InitRamFS generated by slxmkramfs/mkdxsinitrd) [ -f /etc/machine-setup ] && . /etc/machine-setup 2>/dev/null - export PATH=/bin:/sbin:/usr/bin/:/usr/sbin export date="${slxconf_date}" @@ -631,7 +630,20 @@ killall -9 dhcpcd dhclient pump udhcpc 2>/dev/null # copy machine configuration file into stage4 filesystem cp /etc/machine-setup /mnt/etc - +#If uniondirs is not set yet, maybe the unions were given via machine-setup +if [ -z "$uniondirs" ]; then + if [ "$union_type" == "AUFS" ]; then + #Does it contain "://"? + if [ "$aufs" != "${aufs#*://}" ]; then + uniondirs=$aufs + fi + elif [ "$union_type" == "UnionFS" ]; then + #Does it contain "://"? + if [ "$unionfs" != "${unionfs#*://}" ]; then + uniondirs=$unionfs + fi + fi +fi # If locations are given that should be unioned with the fs root, do it if [ -n "$uniondirs" ]; then include_in_fsroot_union $union_type $uniondirs |