Changeset 548
- Timestamp:
- May 6, 2019, 9:36:01 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.in
r546 r548 375 375 376 376 DISTCLEANFILES = Makefile samhain.spec sh_gpg_checksum.h sh_gpg_fp.h \ 377 init/samhain.startLinux init/samhain.startGentoo \377 init/samhain.startLinux init/samhain.startGentoo init/samhain.startSystemd \ 378 378 init/samhain.startLSB init/samhain.startFreeBSD \ 379 379 init/samhain.startSolaris init/samhain.startHPUX \ … … 803 803 echo $(sysconfdir) | sed s,^/,, >> debian/dirs; \ 804 804 echo etc/init.d >> debian/dirs; \ 805 echo lib/systemd/system >> debian/dirs; \ 805 806 echo $(mydatadir) | sed s,^/,, >> debian/dirs; \ 806 807 echo $(mylogdir) | sed s,^/,, >> debian/dirs; \ … … 819 820 echo $(sysconfdir) | sed s,^/,, >> debian/dirs; \ 820 821 echo etc/init.d >> debian/dirs; \ 822 echo lib/systemd/system >> debian/dirs; \ 821 823 echo $(mydatadir) | sed s,^/,, >> debian/dirs; \ 822 824 echo $(mylogdir) | sed s,^/,, >> debian/dirs; \ -
trunk/configure.ac
r544 r548 2694 2694 init/samhain.startLSB 2695 2695 init/samhain.startLinux 2696 init/samhain.startSystemd 2696 2697 init/samhain.startGentoo 2697 2698 init/samhain.startFreeBSD -
trunk/samhain-install.sh.in
r481 r548 893 893 rc_dirz= 894 894 rc_inst="/usr/lib/lsb/install_initd /etc/init.d/@install_name@" 895 rc_uinst=" /usr/lib/lsb/remove_initd /etc/init.d/@install_name@"895 rc_uinst="test -f /etc/init.d/@install_name@ && /usr/lib/lsb/remove_initd /etc/init.d/@install_name@" 896 896 else 897 897 rc_inst= … … 1032 1032 fi 1033 1033 1034 rc_systemd= 1035 if command -v pkg-config >/dev/null 2>&1 1036 then 1037 if pkg-config --exists systemd >/dev/null 2>&1 1038 then 1039 rc_systemd=`pkg-config --variable=systemdsystemunitdir systemd` 1040 fi 1041 fi 1042 1034 1043 if test x"${act}" = xboot 1035 1044 then … … 1106 1115 fi 1107 1116 fi 1117 1118 if test x"${rc_systemd}" != x 1119 then 1120 if test x"$DESTDIR" = x 1121 then 1122 : 1123 else 1124 ${mkinstalldirs} ${DESTDIR}/${rc_systemd} 1125 fi 1126 if test -f init/samhain.startSystemd 1127 then 1128 servicescript=init/samhain.startSystemd 1129 elif test -f samhain.startSystemd 1130 then 1131 servicescript=samhain.startSystemd 1132 else 1133 echo "${0}: cannot find samhain.startSystemd in ./ or ./init" 1134 fi 1135 if test -f ${DESTDIR}/${rc_systemd}/${samhain}.service && test x"$force" != xyes 1136 then 1137 echo " ${DESTDIR}/${rc_systemd}/${samhain}.service exists ... not overwritten (or use --force)" 1138 else 1139 ${INSTALL_DATA} ${servicescript} "${DESTDIR}/${rc_systemd}/${samhain}.service" 1140 fi 1141 fi 1142 1108 1143 echo "installing init scripts completed" 1109 1144 fi … … 1123 1158 do 1124 1159 test -z "$verbose" || echo " rm -f ${rc_dirz}${ff}.d/S99${samhain}" 1125 rm -f ${rc_dirz}${ff}.d/S99${samhain}1160 rm -f "${rc_dirz}${ff}.d/S99${samhain}" 1126 1161 test -z "$verbose" || echo " rm -f ${rc_dirz}${ff}.d/S99${samhain}" 1127 rm -f ${rc_dirz}${ff}.d/K10${samhain}1162 rm -f "${rc_dirz}${ff}.d/K10${samhain}" 1128 1163 done 1129 1164 fi 1130 1165 1131 1166 test -z "$verbose" || echo " rm -f ${rc_main}/${samhain}" 1132 rm -f ${rc_main}/${samhain} 1167 rm -f "${rc_main}/${samhain}" 1168 1169 if test x"${rc_systemd}" != x 1170 then 1171 test -z "$verbose" || echo " rm -f ${rc_systemd}/${samhain}.service" 1172 rm -f "${rc_systemd}/${samhain}.service" 1173 fi 1133 1174 1134 1175 echo " uninstalling init scripts completed" -
trunk/samhain.spec.in
r547 r548 92 92 # after the package is installed 93 93 # 94 install -m 700 samhain-install.sh init/samhain.startLinux init/samhain.startLSB ${RPM_BUILD_ROOT}@mydataroot@94 install -m 700 samhain-install.sh init/samhain.startLinux init/samhain.startLSB init/samhain.startSystemd ${RPM_BUILD_ROOT}@mydataroot@ 95 95 # 96 96 # file list (helpful advice from Lars Kellogg-Stedman) … … 121 121 rm -f ./samhain.startLSB 122 122 rm -f ./samhain.startLinux 123 rm -f ./samhain.startSystemd 123 124 if [ -f @sbindir@/@install_name@_stealth ]; then 124 125 rm -f samhain-install.sh
Note:
See TracChangeset
for help on using the changeset viewer.