janware/jw-pkg
1
Code Pull requests Activity Actions

scripts: Replace standard source path cvs.stable with jw.dev

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-11-28 13:51:53 +00:00
commit 0037554001
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/integrate-distro.sh
View file

@ -630,7 +630,7 @@ cfg_default()
/usr/share/syslinux /srv/nfs/boot/pxe/bin auto bind 0 0
[jcs_conf]
jcs_dir=\$HOME/local/src/cvs.stable/conf/jannet.de/minimalix/suse-$suse_version
jcs_dir=\$HOME/local/src/jw.dev/conf/jannet.de/minimalix/suse-$suse_version
jcs_owner=root
jcs_group=root
jcs_log_dir=\$jcs_dir/log
@ -824,11 +824,11 @@ kill_chroot_processes()
local wait
local p
for p in $pids; do
echo "killing process $pid (`strings /proc/$p/cmdline | sed ':a;N;$!ba;s/\n/ /g'`)"
kill $p
echo "killing process $p (`strings /proc/$p/cmdline | sed ':a;N;$!ba;s/\n/ /g'`)"
kill $p || continue
wait=1
done
[ wait = 1 ] && sleep 1
if [ "$wait" = 1 ]; then sleep 1; fi
}
unmount_devices()
@ -842,7 +842,7 @@ unmount_devices()
for d in $devices; do
check_mount $d && {
[ "$sync" -a -e $root$d -a $d != $ssh_auth_sock ] && run $sync -f $root$d
[ "$d" = /dev ] && sleep 2 # need to do this, otherwise dev is busy, no idea why
#[ "$d" = /dev ] && sleep 2 # need to do this, otherwise dev is busy, no idea why
run umount $root$d
}
done