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

integrate-distro.sh: Ongoing improvements

Browse source 
- Use kernel flavour desktop
  - Beautify reset_host_files()
  - Use host /etc/group and /etc/passwd

Signed-off-by: Jan Lindemann <jan@jannet.de>
This commit is contained in:
Jan Lindemann 2013-04-08 15:03:44 +00:00 • committed by Jan Lindemann
commit ceb3c54235
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/integrate-distro.sh
View file

@ -44,7 +44,7 @@ initrd_modules="
hid-generic hid-generic
" "
kernel_flavour=-default kernel_flavour=-desktop
case $suse_version in case $suse_version in
11.4) 11.4)
@ -702,8 +702,10 @@ use_host_files()
reset_host_files() reset_host_files()
{ {
local f e h local f e h p
for f in $host_files; do for f in $host_files; do
p=$root/$f.diff
diff -u $f $root/$f > $p
for e in $myname rpmnew; do for e in $myname rpmnew; do
h="$root/$f.$e" h="$root/$f.$e"
[ -e "$h" ] && { [ -e "$h" ] && {
@ -712,6 +714,13 @@ reset_host_files()
break break
} }
done done
if [ -s $p ]; then
echo "+ $f and host file differ:"
cat $p
else
echo "+ no difference between $f and host file"
rm -f $p
fi
done done
host_files="" host_files=""
} }
@ -881,7 +890,8 @@ cmd_install()
setup_root_directory setup_root_directory
setup_bind_mounts setup_bind_mounts
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
mkdir -p -m 755 $root/etc mkdir -p -m 755 $root/etc
for c in \ for c in \