diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index 9777d560..6c58d42b 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -708,6 +708,20 @@ make_etc_issue_net() EOT } +make_etc_jcs_jcs_conf() +{ + _cat << EOT + |jcs_dir=\$HOME/local/src/cvs.stable/conf/jannet.de/minimalix/suse-$suse_version + |jcs_owner=root + |jcs_group=root + |jcs_log_dir=\$jcs_dir/log + |jcs_file_extension=inf + |use_checksum=false + |update_checksum_command="/home/tripwire/bin/fs_checksum.sh update" + |jcs_http_path=http://www.jannet.de +EOT +} + setup_boot_loader_local() { check_var_set grub_boot_partition_num grub_slash_boot_partition_num || \ @@ -906,6 +920,7 @@ cmd_install() make_etc_sysctl_conf > $root/etc/sysctl.conf make_etc_issue > $root/etc/issue make_etc_issue_net > $root/etc/issue.net + make_etc_jcs_jcs_conf > $root/etc/jcs/jcs.conf host_zypper "base" install --auto-agree-with-licenses $base_pkgs host_zypper "base update" install --auto-agree-with-licenses $update_pkgs @@ -970,11 +985,14 @@ cmd_install() chroot $root /usr/sbin/pam-config -c chroot $root /usr/sbin/pam-config -a --ldap -# for c in \ -# /etc/pam.d/* \ -# ; do -# cp -rp $c $root$c -# done + local jcs_dir + eval jcs_dir=`make_etc_jcs_jcs_conf | grep "jcs_dir *="` + echo "=== checking jcs dir $jcs_dir" + [ -d "$jcs_dir" ] && { + cd $jcs_dir + cvs update -dP + make setup + } unmount_devices [ -w "$install_dev" ] || {