janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

integrate-distro.sh: Ongoing improvements

Browse source 
- 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 <jan@jannet.de>
This commit is contained in:
Jan Lindemann 2013-04-08 12:57:44 +00:00 • committed by Jan Lindemann
commit 6d4678d6ad
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/integrate-distro.sh
View file

@ -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