diff options
| author | Dirk von Suchodoletz | 2007-04-24 16:19:06 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-04-24 16:19:06 +0200 |
| commit | a9d74e73798d9b322f479a1485f0a7c40149764b (patch) | |
| tree | 2c25d3da8aa9c2a19a051b9841381100f35a253e /initramfs | |
| parent | Support the setup (basic functionality only) of printer and samba (SuSE (diff) | |
| download | core-a9d74e73798d9b322f479a1485f0a7c40149764b.tar.gz core-a9d74e73798d9b322f479a1485f0a7c40149764b.tar.xz core-a9d74e73798d9b322f479a1485f0a7c40149764b.zip | |
Small fix for samba dir and some code simplifications ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@924 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rw-r--r-- | initramfs/distro-specs/suse/functions-default | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index 9ab14815..6783e91d 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -20,11 +20,9 @@ config_distro () { # no need to run start scripts in parallel # enable magic sysrequest for the clients -echo -e "# /etc/${D_SYSCONFDIR}/sysctl - file modified by $0 version $version"\ - > /mnt/etc/${D_SYSCONFDIR}/sysctl.new -sed -e "s,ENABLE_SYSRQ=.*,ENABLE_SYSRQ=\"yes\"," \ - /mnt/etc/${D_SYSCONFDIR}/sysctl > /etc/sysctl -cat /etc/sysctl >> /mnt/etc/${D_SYSCONFDIR}/sysctl +sed -e "1i# /etc/${D_SYSCONFDIR}/sysctl - modified by $0 version $version" \ + -e "s,ENABLE_SYSRQ=.*,ENABLE_SYSRQ=\"yes\"," \ + -i /mnt/etc/${D_SYSCONFDIR}/sysctl # add specific path /var/X11R6/bin ... echo -e "# stuff generated by $0 (out of InitRamFS written $date)\n\ PATH=\"\$PATH:/var/X11R6/bin\"\n\ @@ -56,7 +54,7 @@ ln -sf ../halt /mnt/etc/${D_INITDIR}/rc6.d/S20reboot #sed -e "s,TARGETS =,TARGETS = xdm boot.slx," \ # -i /mnt/etc/${D_INITDIR}/.depend.boot sed -e "s,RUN_PARALLEL=.*,RUN_PARALLEL=\"no\"," \ - -i /mnt/etc/${D_SYSCONFDIR}/boot + -i /mnt/etc/${D_SYSCONFDIR}/boot # if YaST2 should be runnable (without much effect anyway) on the client testmkd /mnt/var/log/YaST2 echo "$host_name" > /mnt/etc/HOSTNAME @@ -191,6 +189,7 @@ fi # configure samba service config_samba () { if [ "$start_samba" != "no" ]; then + testmkd /mnt/var/run/samba if [ "$start_samba" = "yes" ] && [ -f /mnt/etc/init.d/smb ] ; then rllinker "smb" "27" "02" rllinker "nmb" "28" "02" @@ -394,11 +393,9 @@ config_kdm_template # configure bluetooth services config_bt () { if [ -e /mnt/etc/${D_SYSCONFDIR}/bluetooth ] ; then - echo -e "# /etc/${D_SYSCONFDIR}/bluetooth - file modified by $0"\ - > /etc/bluetooth - sed -e "s,START_SERVICES.*,START_SERVICES=\"yes\"," \ - /mnt/etc/${D_SYSCONFDIR}/bluetooth >> /etc/bluetooth - cp /etc/bluetooth /mnt/etc/${D_SYSCONFDIR}/bluetooth + sed -e "1i# /etc/${D_SYSCONFDIR}/bluetooth - file modified by $0" \ + -e "s,START_SERVICES.*,START_SERVICES=\"yes\"," \ + -i /mnt/etc/${D_SYSCONFDIR}/bluetooth else : # no bluetooth components installed fi |