diff options
| -rw-r--r-- | boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm | 4 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/bin/hwautocfg | 2 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/init | 12 | ||||
| -rw-r--r--[-rwxr-xr-x] | initramfs/uclib-rootfs/lib/ld-2.11.2.so | bin | 113964 -> 113964 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | initramfs/uclib-rootfs/lib/libc.so.6 | bin | 1315080 -> 1315080 bytes | |||
| -rw-r--r-- | os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm | 6 | ||||
| -rwxr-xr-x | os-plugins/plugins/xen/init-hooks/20-nw-bridge-config/bridge.sh | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm b/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm index f4e2708c..1334c444 100644 --- a/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm +++ b/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm @@ -211,8 +211,8 @@ sub _copyInitramfsFiles } }eogms; - # force shebang with ash - $text =~ s{\A#!\s*/bin/.+?$}{#!/bin/ash}ms; + # force shebang with ash (deprecated with new busybox) + #$text =~ s{\A#!\s*/bin/.+?$}{#!/bin/ash}ms; $self->addCMD( { file => "$self->{'build-path'}/$relName", diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg index 96bec352..a94af148 100755 --- a/initramfs/stage3-stuff/bin/hwautocfg +++ b/initramfs/stage3-stuff/bin/hwautocfg @@ -21,7 +21,7 @@ for tool in /usr/sbin/acpidump \ /usr/bin/udevinfo \ /sbin/dmraid ; do testmkd ${tool%/*} - echo -e "#!/bin/ash" >${tool} + echo -e "#!/bin/sh" >${tool} chmod u+x ${tool} done # no kernel messages, switch on hotplug via /sbin/mdev diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init index 0d2f0a2d..205da638 100755 --- a/initramfs/stage3-stuff/init +++ b/initramfs/stage3-stuff/init @@ -164,7 +164,7 @@ in $0\ncountry=\"${COUNTRY}\"" >>/etc/initramfs-setup elif [ $DEBUGLEVEL -ge 3 -a $DEBUGLEVEL -le 20 ] ; then # create, start a debug shell process echo "Debug shell started on second console (tty2)" - echo -e "#!/bin/ash\nash" >/bin/debugshell + echo -e "#!/bin/sh\nsh" >/bin/debugshell chmod u+x /bin/debugshell getty -i -n -l /bin/debugshell 38400 tty2 & # start logging (debuglevel >=3) @@ -322,7 +322,7 @@ runinithook '05-have-kernelvars' # module for the network adaptor) if [ ${DEBUGLEVEL} -lt 3 -o ${DEBUGLEVEL} = 8 ] ; then cat<<EOF > /bin/watchdog -#!/bin/ash +#!/bin/sh echo \$$ > /tmp/watchdogpid [ ! -f /proc/version ] && mount -n -t proc proc /proc sleep 120 2> /dev/null @@ -699,7 +699,7 @@ mount -n --bind /mnt/lib/firmware /lib/firmware || error "$init_moddir" # debuglevel (21) is used for the option of manual hwautocfg start if [ ${DEBUGLEVEL} = 21 ] ; then echo "You can run 'hwautocfg main &' manually now ..." - /bin/ash + /bin/sh else [ $DEBUGLEVEL -eq 20 ] && echo "** started hwautocfg in background at \ $(sysup)" @@ -828,7 +828,7 @@ for linux diskless client specific debugging output\nLOGFILE=\"$LOGFILE\"\n#\ # run distribution independent and dependent configuration of files and # services (offer debug shell in runlevel 22) if [ ${DEBUGLEVEL} = 22 ] ; then - /bin/ash + /bin/sh else servconfig & fi @@ -911,7 +911,7 @@ fi # check for any plugin-specific runlevel scripts and run them, if found: if [ ${DEBUGLEVEL} = 25 ] ; then - /bin/ash + /bin/sh else if [ -d /etc/plugin-init.d ]; then for plugin_starter in /etc/plugin-init.d/*.sh; do @@ -958,7 +958,7 @@ postinit # start a debug shell in higher debug levels [ $DEBUGLEVEL -gt 2 -a $DEBUGLEVEL != 8 ] \ - && echo "DEBUGLEVEL>2: starting debug-shell, exit with CTRL+D" && /bin/ash + && echo "DEBUGLEVEL>2: starting debug-shell, exit with CTRL+D" && /bin/sh runinithook '90-postinit-done' diff --git a/initramfs/uclib-rootfs/lib/ld-2.11.2.so b/initramfs/uclib-rootfs/lib/ld-2.11.2.so Binary files differindex fecb3a46..fecb3a46 100755..100644 --- a/initramfs/uclib-rootfs/lib/ld-2.11.2.so +++ b/initramfs/uclib-rootfs/lib/ld-2.11.2.so diff --git a/initramfs/uclib-rootfs/lib/libc.so.6 b/initramfs/uclib-rootfs/lib/libc.so.6 Binary files differindex bfd7ef5d..bfd7ef5d 100755..100644 --- a/initramfs/uclib-rootfs/lib/libc.so.6 +++ b/initramfs/uclib-rootfs/lib/libc.so.6 diff --git a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm index 87c3d9e5..e223dfa3 100644 --- a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm +++ b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm @@ -196,7 +196,7 @@ sub _setupRsyslog my $rlInfo = $self->{distro}->runlevelInfo($kind); my $conf = unshiftHereDoc(<<" End-of-Here"); - #!/bin/ash + #!/bin/sh # written by OpenSLX-plugin 'syslog' rllinker $rlInfo->{scriptName} $rlInfo->{startAt} $rlInfo->{stopAt} @@ -218,7 +218,7 @@ sub _setupSyslogNG my $rlInfo = $self->{distro}->runlevelInfo($kind); my $conf = unshiftHereDoc(<<" End-of-Here"); - #!/bin/ash + #!/bin/sh # written by OpenSLX-plugin 'syslog' cat >/mnt/etc/syslog-ng/syslog-ng.conf <<END @@ -282,7 +282,7 @@ sub _setupSyslogd my $rlInfo = $self->{distro}->runlevelInfo($kind); my $conf = unshiftHereDoc(<<' End-of-Here'); - #!/bin/ash + #!/bin/sh # written by OpenSLX-plugin 'syslog' cat >/mnt/etc/syslog.conf <<END diff --git a/os-plugins/plugins/xen/init-hooks/20-nw-bridge-config/bridge.sh b/os-plugins/plugins/xen/init-hooks/20-nw-bridge-config/bridge.sh index 6aabe8ad..d5245234 100755 --- a/os-plugins/plugins/xen/init-hooks/20-nw-bridge-config/bridge.sh +++ b/os-plugins/plugins/xen/init-hooks/20-nw-bridge-config/bridge.sh @@ -1,4 +1,4 @@ -#!/bin/ash +#!/bin/sh # Copyright (c) 2009 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. |