janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-27 07:33:54 +01:00
Code Activity

integrate-distro.sh: Reorder in preparation for config_script

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2013-08-13 11:13:21 +00:00
commit a6179a0ee5
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/integrate-distro.sh
View file

@ -10,6 +10,7 @@ cwd=`pwd`
ssh_auth_sock=/tmp/agent-host.sock ssh_auth_sock=/tmp/agent-host.sock
env_ssh_auth_sock=$SSH_AUTH_SOCK env_ssh_auth_sock=$SSH_AUTH_SOCK
initrd_modules=" via-rhine r8169 e1000 e1000e b44 myri10ge forcedeth 8139too sata_nv nfs nfs_acl auth_rpcgss nfsv3 nfsv4 fscache lockd sunrpc sis edd sisfb evdev shpchp sis_agp hwmon aufs ahci libahci usbhid hid uhci_hcd ohci_hcd ehci_hcd usbcore hid-generic" initrd_modules=" via-rhine r8169 e1000 e1000e b44 myri10ge forcedeth 8139too sata_nv nfs nfs_acl auth_rpcgss nfsv3 nfsv4 fscache lockd sunrpc sis edd sisfb evdev shpchp sis_agp hwmon aufs ahci libahci usbhid hid uhci_hcd ohci_hcd ehci_hcd usbcore hid-generic"
config_script=
kernel_flavour=-desktop kernel_flavour=-desktop
@ -441,7 +442,6 @@ setup_bind_mounts()
done done
if [ "$env_ssh_auth_sock" ]; then if [ "$env_ssh_auth_sock" ]; then
check_mount $ssh_auth_sock || { check_mount $ssh_auth_sock || {
echo "creating >$ssh_auth_sock<"
run -e mkdir -p `dirname $root/$ssh_auth_sock` run -e mkdir -p `dirname $root/$ssh_auth_sock`
run -e touch $root/$ssh_auth_sock run -e touch $root/$ssh_auth_sock
run -e mount --bind $env_ssh_auth_sock $root/$ssh_auth_sock run -e mount --bind $env_ssh_auth_sock $root/$ssh_auth_sock
@ -895,20 +895,25 @@ set_sysconf_value()
cmd_install() cmd_install()
{ {
if false; then
local c local c
set -e set -e
[ -r "$root_password_file" ] || { [ -r "$root_password_file" ] || {
die "root password file doesn't exist, do echo -n my-secret > $root_password_file" die "root password file doesn't exist, do echo -n my-secret > $root_password_file"
} }
if true; then
setup_root_directory setup_root_directory
setup_bind_mounts setup_bind_mounts
run_hook fs-ready run_hook fs-ready
host_zypper "base" install --auto-agree-with-licenses $base_pkgs
host_zypper "base update" install --auto-agree-with-licenses $update_pkgs
#undo_rpmnew
use_host_files /etc/hosts /etc/resolv.conf /etc/sysconfig/security /etc/nsswitch.conf \ use_host_files /etc/hosts /etc/resolv.conf /etc/sysconfig/security /etc/nsswitch.conf \
/etc/passwd /etc/group /etc/passwd /etc/group
@ -926,10 +931,6 @@ cmd_install()
#make_etc_resolv_conf > $root/etc/resolv.conf #make_etc_resolv_conf > $root/etc/resolv.conf
#make_etc_fstab > $root/etc/fstab #make_etc_fstab > $root/etc/fstab
host_zypper "base" install --auto-agree-with-licenses $base_pkgs
host_zypper "base update" install --auto-agree-with-licenses $update_pkgs
#undo_rpmnew
run setup_zypper_repos base update payload run setup_zypper_repos base update payload
echo "=== refreshing >" echo "=== refreshing >"
@ -954,6 +955,7 @@ cmd_install()
run_hook pkg-installed run_hook pkg-installed
fi # test
export CVSROOT=:ext:$scm_user@cvs.jannet.de:/home/jannet/arc/cvs export CVSROOT=:ext:$scm_user@cvs.jannet.de:/home/jannet/arc/cvs
echo "=== running jcs fetch" echo "=== running jcs fetch"
run_chroot jcs fetch run_chroot jcs fetch
@ -965,7 +967,6 @@ cmd_install()
# 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
fi # test
[ "$install_dev" ] && setup_boot_loader_local [ "$install_dev" ] && setup_boot_loader_local
setup_boot_loader_net setup_boot_loader_net
(cd $root/boot; ln -sf vmlinuz-$kernel_version vmlinuz) (cd $root/boot; ln -sf vmlinuz-$kernel_version vmlinuz)