diff options
| author | Felix Endres | 2007-04-24 18:57:16 +0200 |
|---|---|---|
| committer | Felix Endres | 2007-04-24 18:57:16 +0200 |
| commit | f2ac41518bb3de7a85657713168150987a3b4b68 (patch) | |
| tree | 8b36c84c33e10f28c8df91b863579d16848944b0 /initramfs/initrd-stuff/init | |
| parent | Small fix for samba dir and some code simplifications ... (diff) | |
| download | core-f2ac41518bb3de7a85657713168150987a3b4b68.tar.gz core-f2ac41518bb3de7a85657713168150987a3b4b68.tar.xz core-f2ac41518bb3de7a85657713168150987a3b4b68.zip | |
Die Unions können jetzt auch konsistent über die machine-setup angegeben werden.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@925 95ad53e4-c205-0410-b2fa-d234c58c8868
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 |