From ea7732b0a987401b397f532ae25e79bcaa4cd2f4 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 28 Mar 2014 13:11:30 +0000 Subject: [PATCH] integrate-distro.sh: Ongoing improvements - Script stops during execution of reset_host_files(), fix by enclosing code blocks in "set +e" - Fix syntax error in link of /boot/initrd-local Signed-off-by: Jan Lindemann --- scripts/integrate-distro.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index fd03f1ca..b5694ff2 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -159,7 +159,6 @@ case $suse_version in aufs-util db48-utils " - special_pkgs=" jux-run jux-client-run @@ -171,6 +170,7 @@ case $suse_version in ftp-server-run bprof-run " + # currently unused variable devel_pkgs=" ant @@ -849,6 +849,7 @@ use_host_files() reset_host_files() { + set +e local f e h p for f in $host_files; do p=$root/$f.diff @@ -870,6 +871,8 @@ reset_host_files() rm -f $p done host_files="" + set -e + return 0 } setup_boot_loader_local() @@ -905,7 +908,7 @@ EOT | -M /boot/System.map-$kernel_version \\ | -m "$initrd_modules" \\ | -d $install_dev_root - |ln -sf initrd-local-$kernel_version /boot/initrd-local) + |ln -sf initrd-local-$kernel_version /boot/initrd-local |chmod 644 /boot/initrd-local-$kernel_version EOT chmod 755 $root$mkinitrd_sh