From 4b2e8632eba4fa2343986f897cfcd59ed1413d66 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 22 Jul 2010 02:21:49 +0200 Subject: [PATCH] Make all shell scripts using /bin/bash instead /bin/sh to be able to FAI's environment. /usr/lib/fai/subroutines sadly is a /bin/bash script. As we want to be able to use functions like ifclass we have to use /bin/bash in all our scripts (even though they're POSIX ones), otherwise people using dash as /bin/sh will notice something like: /GRMLBASE/25-locales: 23: ifclass: not found in their FAI's shell.log. Thanks: thermoman Signed-off-by: Michael Prokop --- etc/grml/fai/config/hooks/instsoft.GRMLBASE | 2 +- etc/grml/fai/config/hooks/savelog.LAST.source | 2 +- etc/grml/fai/config/hooks/updatebase.GRMLBASE | 2 +- etc/grml/fai/config/scripts/GRMLBASE/01-packages | 2 +- etc/grml/fai/config/scripts/GRMLBASE/02-mtab | 2 +- etc/grml/fai/config/scripts/GRMLBASE/05-hostname | 2 +- etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs | 2 +- etc/grml/fai/config/scripts/GRMLBASE/15-initsetup | 2 +- etc/grml/fai/config/scripts/GRMLBASE/18-timesetup | 2 +- etc/grml/fai/config/scripts/GRMLBASE/20-sudo | 2 +- etc/grml/fai/config/scripts/GRMLBASE/21-usersetup | 2 +- etc/grml/fai/config/scripts/GRMLBASE/25-locales | 2 +- etc/grml/fai/config/scripts/GRMLBASE/30-fstab | 2 +- etc/grml/fai/config/scripts/GRMLBASE/31-motd | 2 +- etc/grml/fai/config/scripts/GRMLBASE/32-xorg | 2 +- etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup | 2 +- etc/grml/fai/config/scripts/GRMLBASE/34-hosts | 2 +- etc/grml/fai/config/scripts/GRMLBASE/35-network | 2 +- etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils | 2 +- etc/grml/fai/config/scripts/GRMLBASE/37-portmap | 2 +- etc/grml/fai/config/scripts/GRMLBASE/38-udev | 2 +- etc/grml/fai/config/scripts/GRMLBASE/39-modprobe | 2 +- etc/grml/fai/config/scripts/GRMLBASE/40-deborphan | 2 +- etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives | 2 +- etc/grml/fai/config/scripts/GRMLBASE/95-package-information | 2 +- etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs | 2 +- etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges | 2 +- etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot | 2 +- etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index ec40703..b47152b 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/hooks/instsoft.GRML # Purpose: grml specific Debian installation in the chroot # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/hooks/savelog.LAST.source b/etc/grml/fai/config/hooks/savelog.LAST.source index 789c08e..de671e5 100755 --- a/etc/grml/fai/config/hooks/savelog.LAST.source +++ b/etc/grml/fai/config/hooks/savelog.LAST.source @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash # parse all log files for error messages # print errors and warnings found to error.log diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE index c229448..2b9d180 100755 --- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE +++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/hooks/updatebase.GRMLBASE # Purpose: skip task updatebase of FAI when running softupdate # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/01-packages b/etc/grml/fai/config/scripts/GRMLBASE/01-packages index 30e6589..1a1a335 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/01-packages +++ b/etc/grml/fai/config/scripts/GRMLBASE/01-packages @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/01-packages # Purpose: check for packages that have been requested but could not be installed # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/02-mtab b/etc/grml/fai/config/scripts/GRMLBASE/02-mtab index a7efced..76814dd 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/02-mtab +++ b/etc/grml/fai/config/scripts/GRMLBASE/02-mtab @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/02-mtab # Purpose: create mtab if it does not yet exist # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname index ec16d9b..df9c832 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname +++ b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/05-hostname # Purpose: set hostname of live-system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs index d6930fe..ad017fa 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs +++ b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs # Purpose: configure live-initramfs and build initramfs for booting # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup index 72483ea..e4b28f0 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/15-initsetup # Purpose: configure init system for the live-system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/18-timesetup b/etc/grml/fai/config/scripts/GRMLBASE/18-timesetup index 57c288b..de37666 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/18-timesetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/18-timesetup @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/18-timesetup # Purpose: apply default time and timezone settings # Authors: (c) Thomas Lehmann diff --git a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo index d940103..22c07cb 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo +++ b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/20-sudo # Purpose: configure sudo setup of the live-system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup index 66c5680..82eed0b 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/21-usersetup # Purpose: adjust user setup of the live-system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/25-locales b/etc/grml/fai/config/scripts/GRMLBASE/25-locales index 1717c70..ccc4028 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/25-locales +++ b/etc/grml/fai/config/scripts/GRMLBASE/25-locales @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/25-locales # Purpose: locales (language) configuration of the live system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab index bd47b64..c6fb844 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab +++ b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/30-fstab # Purpose: create initial /etc/fstab for use on live-system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/31-motd b/etc/grml/fai/config/scripts/GRMLBASE/31-motd index e24123c..3093e64 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/31-motd +++ b/etc/grml/fai/config/scripts/GRMLBASE/31-motd @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/31-motd # Purpose: make sure the motd setup is correct # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/32-xorg b/etc/grml/fai/config/scripts/GRMLBASE/32-xorg index 6f52a12..b149005 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/32-xorg +++ b/etc/grml/fai/config/scripts/GRMLBASE/32-xorg @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/32-xorg # Purpose: make sure there does not exist /etc/X11/xorg.conf by default # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup index 64bd111..002e000 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup # Purpose: configure Debian package management of live-system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/34-hosts b/etc/grml/fai/config/scripts/GRMLBASE/34-hosts index 961fc5c..a96bd64 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/34-hosts +++ b/etc/grml/fai/config/scripts/GRMLBASE/34-hosts @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/34-hosts # Purpose: configure /etc/hosts of live-system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/35-network b/etc/grml/fai/config/scripts/GRMLBASE/35-network index be04b3e..1b2ba72 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/35-network +++ b/etc/grml/fai/config/scripts/GRMLBASE/35-network @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/35-network # Purpose: set up /etc/network/interfaces of live-system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils b/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils index 7f4e26a..00b9c49 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils +++ b/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils # Purpose: configure cpufrequtils of live-system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/37-portmap b/etc/grml/fai/config/scripts/GRMLBASE/37-portmap index 003869f..017d7d2 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/37-portmap +++ b/etc/grml/fai/config/scripts/GRMLBASE/37-portmap @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/37-portmap # Purpose: configure portmap of live-system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/38-udev b/etc/grml/fai/config/scripts/GRMLBASE/38-udev index a041632..d90669c 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/38-udev +++ b/etc/grml/fai/config/scripts/GRMLBASE/38-udev @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/38-udev # Purpose: configure udev of live-system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe index 5236871..9fffbfb 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe +++ b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/39-modprobe # Purpose: adjust modprobe configuration # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan b/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan index e0f7594..a592f5c 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan +++ b/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/40-deborphan # Purpose: configure packages for deborphan (usually exception rules) # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives index bc6c508..5aff20d 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives +++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives # Purpose: set up /etc/alternatives/* according to grml preferences # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information index 1cd03ed..6886d9f 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information +++ b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/95-package-information # Purpose: store package information of chroot system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs index 06518e9..f1083d3 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs +++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs # Purpose: retreive list of bugreports of installed packages inside chroot # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges b/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges index cf2be94..fe7c9c2 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges +++ b/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges # Purpose: configure apt-listchanges # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot index a8d807d..c7d25ea 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot +++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot # Purpose: clean up chroot system # Authors: grml-team (grml.org), (c) Michael Prokop diff --git a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build index 73d99d6..ef117ae 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build +++ b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build # Purpose: finalize grml chroot build # Authors: grml-team (grml.org), (c) Michael Prokop -- 2.1.4