Author: glen
Date: Mon Dec 19 09:38:39 2005
New Revision: 6659

Modified:
   initng/migrate_rc.d-initng.i.sh
Log:
- unblacklist sys-chroot and random
- kill double newlines on generated .i file
- verbose processing

Modified: initng/migrate_rc.d-initng.i.sh
==============================================================================
--- initng/migrate_rc.d-initng.i.sh     (original)
+++ initng/migrate_rc.d-initng.i.sh     Mon Dec 19 09:38:39 2005
@@ -4,8 +4,7 @@
 # blacklisted because either handled or not real service
 blacklisted() {
        case "$s" in
-       killall | allowlogin | sys-chroots | random | single | \
-       cups | qmail )
+       killall | allowlogin | single | cups | qmail )
                return 0
                ;;
        esac
@@ -24,13 +23,14 @@
 
        network=$(grep /etc/sysconfig/network -c /etc/rc.d/init.d/$s)
        [ $network = 0 ] && network=
+       echo -n "Creating $s ($pkg) as $svc${network:+ (requires network)}: "
 
        echo "%_initng_service_hook -p $pkg $svc" >> deps.spec
-       cat > $svc.i <<EOF
+       sed -e '/./,/^$/!d' > $svc.i <<EOF
 # Autogenerated by $0 on $(LC_ALL=C date)
 service $svc {
        need = system/initial system/mountfs system/rundir;
-       ${network:+require_network;}
+${network:+    require_network;}
 
        exec start = /etc/rc.d/init.d/$s;
        exec_args start = start;
@@ -38,6 +38,8 @@
        exec_args stop = stop;
 }
 EOF
+
+       echo "OK"
 }
 
 for f in $(find /etc/rc.d/init.d -type f -perm +100); do
@@ -67,9 +69,7 @@
                [ $break = 1 ] && continue
        fi
 
-       echo -n "Creating $s ($pkg) as $svc"
        add $s $pkg $svc
-       echo "Done"
 
        # running on real root. add it instantly
        if [ -f /etc/initng/$svc.i ]; then
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to