From dd814754c67b9089428e17756d40fd848c58647f Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 8 Jul 2011 02:40:11 +0200 Subject: [PATCH] GRMLBASE scripts: run all fcopy commands in verbose mode. We want to be able to catch in the logs as much information as possible, therefore be as verbose as possible. --- etc/grml/fai/config/scripts/GRMLBASE/10-configure-initramfs | 6 +++--- etc/grml/fai/config/scripts/GRMLBASE/15-initsetup | 4 ++-- etc/grml/fai/config/scripts/GRMLBASE/20-sudo | 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/34-hosts | 2 +- etc/grml/fai/config/scripts/GRMLBASE/35-network | 2 +- etc/grml/fai/config/scripts/GRMLBASE/39-modprobe | 4 ++-- etc/grml/fai/config/scripts/GRMLBASE/41-modules | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/etc/grml/fai/config/scripts/GRMLBASE/10-configure-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/10-configure-initramfs index b85fc80..3dea9ae 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/10-configure-initramfs +++ b/etc/grml/fai/config/scripts/GRMLBASE/10-configure-initramfs @@ -9,9 +9,9 @@ set -u set -e -fcopy /usr/share/initramfs-tools/scripts/init-top/grml -fcopy /etc/initramfs-tools/hooks/000-udev-shutup -fcopy /etc/initramfs-tools/conf.d/xz-compress +fcopy -v /usr/share/initramfs-tools/scripts/init-top/grml +fcopy -v /etc/initramfs-tools/hooks/000-udev-shutup +fcopy -v /etc/initramfs-tools/conf.d/xz-compress if ! [ -f $target/usr/share/initramfs-tools/scripts/live ] ; then echo "Error: live-boot/-initramfs does not seem to be present, can not create initramfs. Exiting.">&2 diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup index c49f70c..d09ce33 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup @@ -26,10 +26,10 @@ fi cp $target/etc/runlevel.conf $target/etc/runlevel.conf.original # provide Grml's default file-rc configuration -fcopy /etc/runlevel.conf +fcopy -v /etc/runlevel.conf # provide Grml's inittab configuration -fcopy /etc/inittab +fcopy -v /etc/inittab ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2 diff --git a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo index d89c196..b8a4198 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo +++ b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo @@ -14,7 +14,7 @@ USERNAME='' [ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local [ -n "$USERNAME" ] || USERNAME=grml -fcopy /etc/sudoers +fcopy -v /etc/sudoers sed -i "s/\$USERNAME/$USERNAME/" $target/etc/sudoers chmod 440 $target/etc/sudoers diff --git a/etc/grml/fai/config/scripts/GRMLBASE/25-locales b/etc/grml/fai/config/scripts/GRMLBASE/25-locales index 58ed8c7..9987614 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/25-locales +++ b/etc/grml/fai/config/scripts/GRMLBASE/25-locales @@ -11,7 +11,7 @@ set -e # set up /etc/locale.gen, only GRML_FULL and LOCALES have # the full setup, GRMLBASE installs a minimal configuration -fcopy /etc/locale.gen +fcopy -v /etc/locale.gen # get rid of locales unless using class LOCALES set +u diff --git a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab index 850d2af..1585caf 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab +++ b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab @@ -14,7 +14,7 @@ USERNAME='' [ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local [ -n "$USERNAME" ] || USERNAME=grml -fcopy /etc/fstab +fcopy -v /etc/fstab sed -i "s/uid=USERNAME,gid=USERNAME/uid=$USERNAME,gid=$USERNAME/" $target/etc/fstab ## END OF FILE ################################################################# diff --git a/etc/grml/fai/config/scripts/GRMLBASE/31-motd b/etc/grml/fai/config/scripts/GRMLBASE/31-motd index 71cf1f8..b1ed247 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/31-motd +++ b/etc/grml/fai/config/scripts/GRMLBASE/31-motd @@ -9,7 +9,7 @@ set -u set -e -fcopy /etc/motd +fcopy -v /etc/motd ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2 diff --git a/etc/grml/fai/config/scripts/GRMLBASE/34-hosts b/etc/grml/fai/config/scripts/GRMLBASE/34-hosts index 3f9cec1..d943534 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/34-hosts +++ b/etc/grml/fai/config/scripts/GRMLBASE/34-hosts @@ -14,7 +14,7 @@ HOSTNAME='' [ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local [ -n "$HOSTNAME" ] || HOSTNAME=grml -fcopy /etc/hosts +fcopy -v /etc/hosts # replace $HOSTNAME with the real hostname: sed -i "s/\$HOSTNAME/$HOSTNAME/" $target/etc/hosts diff --git a/etc/grml/fai/config/scripts/GRMLBASE/35-network b/etc/grml/fai/config/scripts/GRMLBASE/35-network index 135b3f9..a87d751 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/35-network +++ b/etc/grml/fai/config/scripts/GRMLBASE/35-network @@ -9,7 +9,7 @@ set -u set -e -fcopy /etc/network/interfaces +fcopy -v /etc/network/interfaces ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2 diff --git a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe index 6b00768..a43c2d1 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe +++ b/etc/grml/fai/config/scripts/GRMLBASE/39-modprobe @@ -18,10 +18,10 @@ set -e find $target/etc/modprobe.d -maxdepth 1 -type f ! -name \*\.conf -exec mv {} {}.conf \; # Replace modprobe configuration files to workaround issues. -fcopy /etc/modprobe.d/radeon-kms.conf +fcopy -v /etc/modprobe.d/radeon-kms.conf # Copy the loop options -fcopy /etc/modprobe.d/loop-part.conf +fcopy -v /etc/modprobe.d/loop-part.conf ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2 diff --git a/etc/grml/fai/config/scripts/GRMLBASE/41-modules b/etc/grml/fai/config/scripts/GRMLBASE/41-modules index 796449d..dd90ff3 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/41-modules +++ b/etc/grml/fai/config/scripts/GRMLBASE/41-modules @@ -9,7 +9,7 @@ set -u set -e -fcopy /etc/modules +fcopy -v /etc/modules ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2 -- 2.1.4