Changeset 71 for trunk

Timestamp:

Oct 30, 2006, 9:35:00 PM (18 years ago)

Author:

rainer

Message:

Support installation of init scripts on MaxOS X.

Location:

trunk

Files:

• Makefile.in (modified) (3 diffs)
• configure.ac (modified) (1 diff)
• samhain-install.sh.in (modified) (1 diff)

trunk/Makefile.in

@@ -339 +339 @@
         init/samhain.startLSB init/samhain.startFreeBSD \
         init/samhain.startSolaris init/samhain.startHPUX \
-        init/samhain.startIRIX \
+        init/samhain.startIRIX init/samhain.startMACOSX \
         deploy.sh sh_MK.h samhain-install.sh sh_gpg_chksum.h sh_gpg_fp.h \
         rules.deb rules.deb-light \
@@ -672 +672 @@
         configfile=`echo  @myconffile@ | sed 's%^REQ_FROM_SERVER%%'`; \
         echo  "test -f $$configfile || cp -p $$temp/* $$configfile" >> $$STAGE/setup.sh; \
-        echo  "./samhain-install.sh --express --verbose install-boot"    >> $$STAGE/setup.sh; \
+        echo  "./samhain-install.sh --express --verbose install-boot || echo 'Cannot install init script'"    >> $$STAGE/setup.sh; \
         cp $(top_srcdir)/mkinstalldirs $$STAGE/; \
         cp $(top_srcdir)/install-sh $$STAGE/; \
@@ -1548 +1548 @@
 #
 INITFILES=samhain.startIRIX samhain.startFreeBSD samhain.startSolaris \
-samhain.startLSB samhain.startGentoo samhain.startLinux samhain.startHPUX
+samhain.startLSB samhain.startGentoo samhain.startLinux samhain.startHPUX \
+samhain.startIRIX 
 
 SCRIPTFILES=redhat_i386.client.spec check_samhain.pl samhainadmin.pl 

trunk/configure.ac

@@ -2359 +2359 @@
 init/samhain.startHPUX
 init/samhain.startIRIX
+init/samhain.startMACOSX
 samhain.spec
 rules.deb

trunk/samhain-install.sh.in

@@ -757 +757 @@
 
     case "$platform" in
+    Darwin/*)
+        DVER="MACOSX"
+        test -z "$verbose" || echo "MacOS X system detected"
+        rc_main="/Library/StartupItems/${samhain}"
+        ${mkinstalldirs} ${rc_main}
+        rc_dirz=
+        rc_inst="(cd /Library/StartupItems/${samhain} && echo '{' >StartupParameters.plist && echo '  Description        = \"@install_name@\";'  >>StartupParameters.plist && echo '  Provides           = (\"@install_name@\");' >>StartupParameters.plist && echo '  Requires           = (\"Network\");'      >>StartupParameters.plist && echo '  OrderPreference     = \"Last\";' >>StartupParameters.plist && echo '}' >>StartupParameters.plist && chmod 644 StartupParameters.plist; )"
+        rc_uinst="rm -rf /Library/StartupItems/@install_name@"
+        ;;
+
     IRIX*/*)
         DVER="IRIX"