janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 22:40:38 +01:00
Code Activity

integrate-distro.sh: Ongoing improvements

Browse source 
- Fix mode of /root/.ssh/config
  - Run jcs setup earlier
  - Move RUN_PARALLEL, DHCPD_INTERFACE and DHCPD_CONF_INCLUDE_FILES into jcs

Signed-off-by: Jan Lindemann <jan@jannet.de>
This commit is contained in:
Jan Lindemann 2013-04-08 11:02:46 +00:00 • committed by Jan Lindemann
commit 8e1ae49602
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
scripts/integrate-distro.sh
View file

@ -858,10 +858,12 @@ insserv_all()
boot.juxearly boot.juxearly
boot.bprof boot.bprof
sshd sshd
ldap
jux jux
" "
services=" services="
sshd sshd
ldap
" "
case $suse_version in case $suse_version in
@ -958,7 +960,7 @@ cmd_install()
mkdir -p -m 700 $root/root/.ssh mkdir -p -m 700 $root/root/.ssh
make_home_ssh_conf > $root/root/.ssh/config make_home_ssh_conf > $root/root/.ssh/config
chmod 600 $root/.ssh/config chmod 600 $root/root/.ssh/config
[ "$copy_source_dir" ] && { [ "$copy_source_dir" ] && {
echo "=== copying over dir $copy_source_dir" echo "=== copying over dir $copy_source_dir"
@ -968,6 +970,14 @@ cmd_install()
chroot $root /opt/ytools/bin/jcs init # TODO: remove this chroot $root /opt/ytools/bin/jcs init # TODO: remove this
} }
echo "=== running jcs setup"
export CVSROOT=:ext:$scm_user@cvs.jannet.de:/home/jannet/arc/cvs
if [ "$SSH_AUTH_SOCK" ]; then
mkdir -m 700 -p `dirname $root/$SSH_AUTH_SOCK`
ln $SSH_AUTH_SOCK $root/$SSH_AUTH_SOCK
fi
chroot $root jcs setup
# seed the ldap database # seed the ldap database
# FIXME: this does not work off a netboot distro # FIXME: this does not work off a netboot distro
slapcat | chroot $root /usr/sbin/slapadd -qw slapcat | chroot $root /usr/sbin/slapadd -qw
@ -978,24 +988,18 @@ cmd_install()
insserv_all insserv_all
set_sysconf_value etc/sysconfig/boot RUN_PARALLEL no
set_sysconf_value etc/sysconfig/dhcpd DHCPD_INTERFACE eth0 # TODO: bprof this
set_sysconf_value etc/sysconfig/dhcpd DHCPD_CONF_INCLUDE_FILES \
"/etc/hosts /etc/ldap.conf /etc/openldap/ldap.conf /etc/certs /etc/nsswitch.conf /etc/dhcpd.conf.d"
echo "=== using root password file $root_password_file" echo "=== using root password file $root_password_file"
echo -n root: | cat - $root_password_file | chroot $root /usr/sbin/chpasswd
case $suse_version in case $suse_version in
11.4) 11.4)
cat $root_password_file | chroot $root /usr/bin/passwd --stdin chroot $root /sbin/SuSEconfig
;; ;;
*) *)
echo -n root: | cat - $root_password_file | chroot $root /usr/sbin/chpasswd
;; ;;
esac esac
chroot $root /sbin/ldconfig
chroot $root /sbin/SuSEconfig
chroot $root /opt/jux/bin/jux-init-namespace.sh chroot $root /opt/jux/bin/jux-init-namespace.sh
chroot $root /sbin/ldconfig
install -m 755 -d $root/srv/nfs/boot/pxe/bin install -m 755 -d $root/srv/nfs/boot/pxe/bin
install -m 755 -d $root/srv/nfs/var install -m 755 -d $root/srv/nfs/var
install -m 777 -d $root/srv/nfs/var/cores install -m 777 -d $root/srv/nfs/var/cores
@ -1004,13 +1008,6 @@ cmd_install()
chroot $root /usr/sbin/pam-config -c chroot $root /usr/sbin/pam-config -c
chroot $root /usr/sbin/pam-config -a --ldap chroot $root /usr/sbin/pam-config -a --ldap
echo "=== running jcs setup"
export CVSROOT=:ext:$scm_user@cvs.jannet.de:/home/jannet/arc/cvs
if [ "$SSH_AUTH_SOCK" ]; then
mkdir -m 700 -p `dirname $root/$SSH_AUTH_SOCK`
ln $SSH_AUTH_SOCK $root/$SSH_AUTH_SOCK
fi
chroot $root jcs setup
rm -f $root/$SSH_AUTH_SOCK rm -f $root/$SSH_AUTH_SOCK
unmount_devices unmount_devices