* Add #!/bin/bash to install hooks and fixed vimlines.
* Removed empty variables.
* Reorder variables, adjust brace/parens in functions.
* Removed things implemented in base hook (/tmp, /etc/fstab).
Signed-off-by: Gerardo Exequiel Pozzi
---
archiso/archiso_shutdown | 2 +-
archiso/install/archiso | 16 +++++-----------
archiso/install/archiso_loop_mnt | 15 +++++----------
archiso/install/archiso_pxe_common | 19 ++++++++-----------
archiso/install/archiso_pxe_http | 13 +++++--------
archiso/install/archiso_pxe_nbd | 14 ++++++--------
archiso/install/archiso_pxe_nfs | 6 ++++--
archiso/install/archiso_shutdown | 9 +++++++--
8 files changed, 41 insertions(+), 53 deletions(-)
diff --git a/archiso/archiso_shutdown b/archiso/archiso_shutdown
index de1197e..26220a6 100644
--- a/archiso/archiso_shutdown
+++ b/archiso/archiso_shutdown
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ash
# /oldroot depends on things inside /oldroot/run/archiso...
mkdir /oldrun
diff --git a/archiso/install/archiso b/archiso/install/archiso
index 25eccea..878839b 100644
--- a/archiso/install/archiso
+++ b/archiso/install/archiso
@@ -1,9 +1,8 @@
-build ()
-{
- MODULES="cdrom loop dm-snapshot"
+#!/bin/bash
- BINARIES=""
- FILES=""
+build() {
+ MODULES="cdrom loop dm-snapshot"
+ SCRIPT="archiso"
add_binary /lib/udev/cdrom_id
add_binary blockdev
@@ -15,11 +14,6 @@ build ()
add_file /lib/udev/rules.d/10-dm.rules
add_file /lib/udev/rules.d/95-dm-notify.rules
add_file /lib/initcpio/udev/11-dm-initramfs.rules /lib/udev/rules.d/11-dm-initramfs.rules
-
- # Add an empty fstab to avoid mount warning when -o remount is used (this should go to install/base)
- : > "$BUILDROOT/etc/fstab"
-
- SCRIPT="archiso"
}
-# vim:ft=sh:ts=4:sw=4:et:
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/archiso/install/archiso_loop_mnt b/archiso/install/archiso_loop_mnt
index 886cbb8..4141043 100644
--- a/archiso/install/archiso_loop_mnt
+++ b/archiso/install/archiso_loop_mnt
@@ -1,18 +1,13 @@
-# vim: set ft=sh:
-
-build ()
-{
- MODULES=""
-
- BINARIES=""
- FILES=""
+#!/bin/bash
+build() {
SCRIPT="archiso_loop_mnt"
}
-help ()
-{
+help() {
cat< $BUILDROOT/etc/nsswitch.conf
}
-help ()
-{
+help() {
cat<