From c0d5d5c17103e3cd9346b3bd80c74d08e937bc76 Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@fedoraproject.org>
Date: Wed, 20 May 2009 16:42:31 +0000
Subject: [PATCH] Updating to use dash instead of msh

---
 kdump_build_helpers/populate_kdump_std_files  | 7 +++++--
 kdump_initscripts/kdumpinit.rootfs            | 4 ++--
 kdump_runtime_helpers/assemble_lvm_array      | 2 +-
 kdump_runtime_helpers/load_modules            | 2 +-
 kdump_runtime_helpers/start_udev              | 2 ++
 kdump_runtime_helpers/wait_for_critical_disks | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/kdump_build_helpers/populate_kdump_std_files b/kdump_build_helpers/populate_kdump_std_files
index 0e92943..c10902c 100755
--- a/kdump_build_helpers/populate_kdump_std_files
+++ b/kdump_build_helpers/populate_kdump_std_files
@@ -16,8 +16,8 @@ do
 	ln -s busybox $STAGE_DIR/sbin/$i
 done
 
-# We always get kpartx, dmsetup, lvm and mdadm
-for i in /sbin/lvm /sbin/kpartx /sbin/mdadm /sbin/dmsetup
+# We always get dash kpartx, dmsetup, lvm and mdadm
+for i in /sbin/dash /sbin/lvm /sbin/kpartx /sbin/mdadm /sbin/dmsetup
 do
 	install_with_deps $i 755
 done
@@ -33,4 +33,7 @@ do
 	fi
 done
 
+# make dash our default shell
+$(cd $STAGE_DIR/bin; ln -s /bin/dash sh)
+
 exit 0
diff --git a/kdump_initscripts/kdumpinit.rootfs b/kdump_initscripts/kdumpinit.rootfs
index cbf7e6d..166262d 100644
--- a/kdump_initscripts/kdumpinit.rootfs
+++ b/kdump_initscripts/kdumpinit.rootfs
@@ -1,4 +1,4 @@
-#!/bin/msh
+#!/bin/sh
 
 ###################################################
 # Start by setting up the console to work as a user
@@ -19,7 +19,7 @@ start_udev
 # Load all the modules based on 
 # /etc/module_load_list
 ##################################################
-load_all_modules
+load_modules
 
 
 
diff --git a/kdump_runtime_helpers/assemble_lvm_array b/kdump_runtime_helpers/assemble_lvm_array
index f824582..a1cdcac 100755
--- a/kdump_runtime_helpers/assemble_lvm_array
+++ b/kdump_runtime_helpers/assemble_lvm_array
@@ -1,4 +1,4 @@
-#!/bin/msh
+#!/bin/sh
 #kdump-requires: /etc/lvm/lvm.conf
 #
 echo "Scanning logical volumes"
diff --git a/kdump_runtime_helpers/load_modules b/kdump_runtime_helpers/load_modules
index b11c904..645fada 100755
--- a/kdump_runtime_helpers/load_modules
+++ b/kdump_runtime_helpers/load_modules
@@ -1,4 +1,4 @@
-#!/bin/msh
+#!/bin/sh
 #kdump-requires: /etc/module_load_list
 
 echo "Loading modules"
diff --git a/kdump_runtime_helpers/start_udev b/kdump_runtime_helpers/start_udev
index d84ede2..26dec70 100755
--- a/kdump_runtime_helpers/start_udev
+++ b/kdump_runtime_helpers/start_udev
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 if [ ! -x /bin/udevd ]
 then
 	echo "udev isn't installed in this initramfs!"
diff --git a/kdump_runtime_helpers/wait_for_critical_disks b/kdump_runtime_helpers/wait_for_critical_disks
index 733f7f3..e304637 100755
--- a/kdump_runtime_helpers/wait_for_critical_disks
+++ b/kdump_runtime_helpers/wait_for_critical_disks
@@ -1,4 +1,4 @@
-#!/bin/msh
+#!/bin/sh
 #kdump-requires: /etc/critical-disks
 
 echo "Waiting for critical disks"