Ignore:
Timestamp:
Jul 18, 2015, 5:06:52 PM (6 years ago)
Author:
katerina
Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/samhain-install.sh.in

    r442 r481  
    6565    echo 'action = install-boot|install-data|install-user'
    6666    echo '         uninstall|purge|uninstall-boot'
    67     echo '         uninstall-data|uninstall-man|uninstall-program|uninstall-lkm'
     67    echo '         uninstall-data|uninstall-man|uninstall-program'
    6868    echo 'samhain-install.sh --print-config <item>'
    6969    echo 'item = name | basekey | prefix | exec_prefix | sbin_dir | man_dir'
     
    514514            break;;
    515515
    516         uninstall-lkm)
    517             act=ulkm
    518             break;;
    519 
    520516        uninstall | remove | purge)
    521517            opts=
     
    525521            test x"$DESTDIR" = "x" || opts="$opts --destdir=$DESTDIR"
    526522            test x"$1" = "xpurge" && purge=yes
    527             echo "$0 $opts uninstall-lkm"
    528             eval $0 $opts uninstall-lkm
    529523            echo "$0 $opts uninstall-program"
    530524            eval $0 $opts uninstall-program
     
    680674              break
    681675              ;;
    682            Linux/* )
     676           Linux/* | GNU/kFreeBSD/* | GNU/* )
    683677               file=/etc/passwd
    684678               entry="${user}:*:${uid}:${gid}:${realname}:${home}:${shell}"
     
    886880        ;;
    887881
    888     Linux/*)
     882    Linux/* | GNU/kFreeBSD* | GNU/* )
    889883        rlv="2 3 4 5"
    890884        linkopt="-f -s"
     
    11451139fi
    11461140
    1147 if test x"${act}" = xulkm
    1148 then
    1149     RVER=`uname -r`
    1150     if test "x@sh_lkm@" != "x"; then
    1151         if test -d /lib/modules/$RVER; then
    1152             MODDIR="/lib/modules/$RVER"
    1153         elif test -d /lib/modules/misc; then
    1154             MODDIR="/lib/modules/misc"
    1155         elif test -d /lib/modules; then
    1156             MODDIR="/lib/modules/misc"
    1157         fi
    1158         # -- NEW --
    1159         ALLMODS="@sh_lkm@"
    1160         for p in $ALLMODS; do
    1161             test -z "$verbose" || echo "  rm -f ${DESTDIR}${MODDIR}/`echo $p|sed '
    1162 s%samhain%@install_name@%'`"
    1163             rm -f ${DESTDIR}${MODDIR}/`echo $p|sed 's%samhain%@install_name@%'`
    1164         done
    1165     fi
    1166 fi
    1167 
    11681141if test x"${act}" = xuprogram
    11691142then
    1170     PROGRAMS="@setpwd_prg@ @stegin_prg@ @yulectl_prg@ @sh_main_prg@"
     1143    PROGRAMS="@setpwd_prg@ @stegin_prg@ @yulectl_prg@ @sh_main_prg@ @samhainadmin_prg@"
    11711144    for p in $PROGRAMS; do
    1172         test -z "$verbose" || echo "  rm -f ${DESTDIR}${sbindir}/`echo $p|sed 's%samhain%@install_name@%'|sed 's%yule%@install_name@%'`"
    1173         rm -f ${DESTDIR}${sbindir}/`echo $p|sed 's%samhain%@install_name@%'|sed 's%yule%@install_name@%'`
     1145        test -z "$verbose" || echo "  rm -f ${DESTDIR}${sbindir}/`echo $p|sed 's%samhain%@install_name@%'|sed 's%yule%@install_name@%'|sed 's%.*/%%'`"
     1146        rm -f ${DESTDIR}${sbindir}/`echo $p|sed 's%samhain%@install_name@%'|sed 's%yule%@install_name@%'|sed 's%.*/%%'`
    11741147    done
    11751148    test -z "$verbose" || echo $ECHO_N "  ${SH_RMDIR} ${DESTDIR}${sbindir} ... $ECHO_C"
Note: See TracChangeset for help on using the changeset viewer.