diff options
| author | Dirk von Suchodoletz | 2007-04-25 09:16:08 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-04-25 09:16:08 +0200 |
| commit | 1e0bbaed4e1d21f36cabd9a82e535ccd93647b9f (patch) | |
| tree | 35b83d81e24a8782cb1fb931f7bcb920bc0facd4 /initramfs/distro-specs | |
| parent | Die Unions können jetzt auch konsistent über die machine-setup angegeben we... (diff) | |
| download | core-1e0bbaed4e1d21f36cabd9a82e535ccd93647b9f.tar.gz core-1e0bbaed4e1d21f36cabd9a82e535ccd93647b9f.tar.xz core-1e0bbaed4e1d21f36cabd9a82e535ccd93647b9f.zip | |
Some cleanup ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@926 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/distro-specs')
| -rw-r--r-- | initramfs/distro-specs/suse/functions-default | 13 | ||||
| -rw-r--r-- | initramfs/distro-specs/ubuntu/functions-default | 8 |
2 files changed, 6 insertions, 15 deletions
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index 6783e91d..37bc5539 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -475,11 +475,9 @@ fi config_automount () { if [ -e /mnt/etc/${D_SYSCONFDIR}/autofs ] ; then testmkd /var/lock/subsys - echo -e "# /etc/${D_SYSCONFDIR}/autofs - file modified by\n#\t$0:\n#" \ - > /etc/autofs - sed -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \ - /mnt/etc/${D_SYSCONFDIR}/autofs >> /etc/autofs - cp /etc/autofs /mnt/etc/${D_SYSCONFDIR}/autofs + sed -e "1i# /etc/${D_SYSCONFDIR}/autofs - file modified by\n#\t$0:\n#" \ + -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \ + -i /mnt/etc/${D_SYSCONFDIR}/autofs rllinker "autofs" "18" "04" else error "$df_erramt" nonfatal @@ -526,11 +524,6 @@ if [ -f /mnt/etc/${D_SYSCONFDIR}/vmware ] ; then /mnt/etc/${D_INITDIR}/.depend.start >> /etc/.depend.start echo "vmware-prep: " >> /etc/.depend.start cp /etc/.depend.start /mnt/etc/${D_INITDIR}/.depend.start - # this line should be added to /etc/hotplug.d/usb/50-usb.hotplug - # to block linux from handling usb events during vmware sessions - #sed -e '/USB-specific/{;i\' \ - # -e 'ps aux |grep -i vmware| grep -v "grep" >/dev/null 2>&1 && exit 0' \ - # -e ' }' -i /mnt/etc/hotplug.d/usb/50-usb.hotplug else error "df_errvmw" nonfatal fi diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default index a2e6de7c..2d0da092 100644 --- a/initramfs/distro-specs/ubuntu/functions-default +++ b/initramfs/distro-specs/ubuntu/functions-default @@ -441,11 +441,9 @@ if [ -f /mnt/etc/init.d/autofs ] ; then 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#" \ - > /etc/autofs - sed -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \ - /mnt/etc/${D_SYSCONFDIR}/autofs >> /etc/autofs - cp /etc/autofs /mnt/etc/${D_SYSCONFDIR}/autofs + sed -e "1i# /etc/${D_SYSCONFDIR}/autofs - file modified by\n#\t$0:\n#" \ + -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \ + -i /mnt/etc/${D_SYSCONFDIR}/autofs config_portmap rllinker "autofs" "18" "04" fi |