From 6d4678d6add599d3d90ecb3c156728bf32ccb88f Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 8 Apr 2013 12:57:44 +0000 Subject: [PATCH] integrate-distro.sh: Ongoing improvements - Protect against invalid architecture after -a option - Push some more files into jcs (passwd, group, nsswitch.conf, slapd.conf, sysconfig/keyboard sysconfig/clock, authldap.schema) Signed-off-by: Jan Lindemann --- scripts/integrate-distro.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index 4a9f7388..5b63aa13 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -900,18 +900,9 @@ cmd_install() setup_root_directory setup_bind_mounts - mkdir -p -m 755 $root/etc - mkdir -p -m 755 $root/etc/openldap for c in \ - /etc/passwd \ - /etc/group \ - /etc/nsswitch.conf \ /etc/certs \ - /etc/openldap/slapd.conf \ - /etc/sysconfig/keyboard \ - /etc/sysconfig/clock \ - /etc/openldap/schema/authldap.schema \ /etc/opt/bprof/bprof.secret \ ; do install -d -m 755 `dirname $root$c` @@ -919,6 +910,7 @@ cmd_install() done install -d -m 755 $root/etc/dhcpd.conf.d + mkdir -p -m 755 $root/etc/openldap make_netboot_etc_ldap_conf > $root/etc/ldap.conf.netboot make_netboot_etc_openldap_ldap_conf > $root/etc/openldap/ldap.conf.netboot make_netboot_etc_hosts > $root/etc/hosts.netboot @@ -1037,8 +1029,10 @@ i386|i586|i686) l32=linux32;; esac ;; -x86_64) +x86_64|"") ;; +*) + die "invalid architecture $arch specified";; esac if [ `whoami` != root -o "$l32" ]; then