diff options
| author | Nico Dietrich | 2006-04-06 16:00:50 +0200 |
|---|---|---|
| committer | Nico Dietrich | 2006-04-06 16:00:50 +0200 |
| commit | ea38426a6928d4db3b716c3aeb34f29bf4bac40c (patch) | |
| tree | aa27c3f38244a3eecbe5ca9bfe3aa4af251e8670 /initrd | |
| parent | don't start vmware in case $vmware=no!! (diff) | |
| download | core-ea38426a6928d4db3b716c3aeb34f29bf4bac40c.tar.gz core-ea38426a6928d4db3b716c3aeb34f29bf4bac40c.tar.xz core-ea38426a6928d4db3b716c3aeb34f29bf4bac40c.zip | |
do nfs over tcp, unset env. variables after initrd
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@169 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
| -rw-r--r-- | initrd/distro-specs/ubuntu/functions-5.10 | 2 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/init | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10 index 2e393b4a..272b966a 100644 --- a/initrd/distro-specs/ubuntu/functions-5.10 +++ b/initrd/distro-specs/ubuntu/functions-5.10 @@ -252,7 +252,7 @@ if [ -f /mnt/etc/init.d/autofs ] ; then echo -e "/home\t/etc/auto.${automnt_dir}\n" >> /mnt/etc/auto.master echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \ > /mnt/etc/auto.${automnt_dir} - echo -e "*\t-rsize=32768,wsize=32768,rw\t${automnt_src}/&" \ + echo -e "*\t-rsize=32768,wsize=32768,tcp,rw\t${automnt_src}/&" \ >> /mnt/etc/auto.${automnt_dir} fi echo -e "# /etc/sysconfig/autofs - file modified by\n#\t$0:\n#" \ diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index bea32b4d..b21ffc8d 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -437,5 +437,7 @@ mount -n --move /dev /mnt/dev killall -9 udevd 2>/dev/null umount -n /proc [ -n "${UNIONFS}" ] && mount -n --move /root /mnt/mnt +# unset old environment variables +unset debug date initrd ip nfsroot vci # new style of pivoting exec run-init -c dev/console /mnt /sbin/init || error "$init_runinit" |