Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-unstable/include/mtools.sminc

    Diff of /branches/R11-unstable/include/mtools.sminc

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 12654 by niro, Tue Jun 26 15:41:10 2012 UTC revision 12655 by niro, Tue Jun 26 16:15:58 2012 UTC
    # Line 150  minstalludevrule() Line 150  minstalludevrule()
    150  {  {
    151   local udevrule   local udevrule
    152   local file   local file
    153     local udevrulesddir="/usr/lib/udev/rules.d"
    154    
    155   [[ -z "$1" ]] && die "No udev rule given"   [[ -z "$1" ]] && die "No udev rule given"
    156    
    # Line 169  minstalludevrule() Line 170  minstalludevrule()
    170   fi   fi
    171    
    172   # needed directory   # needed directory
    173   install -d ${BINDIR}/lib/udev/rules.d || die   install -d ${BINDIR}${udevrulesddir} || die
    174    
    175   # install our udev rule   # install our udev rule
    176   install -v -m 0644 -o root -g root ${file} ${BINDIR}/lib/udev/rules.d/${udevrule} || die   install -v -m 0644 -o root -g root ${file} ${BINDIR}${udevrulesddir}/${udevrule} || die
    177  }  }
    178    
    179  minstalludevhelper()  minstalludevhelper()
    180  {  {
    181   local udevhelper   local udevhelper
    182   local file   local file
    183     local udevdir="/usr/lib/udev"
    184    
    185   [[ -z "$1" ]] && die "No udev helper given"   [[ -z "$1" ]] && die "No udev helper given"
    186    
    # Line 198  minstalludevhelper() Line 200  minstalludevhelper()
    200   fi   fi
    201    
    202   # needed directory   # needed directory
    203   install -d ${BINDIR}/lib/udev || die   install -d ${BINDIR}${udevdir} || die
    204    
    205   # install our udev-helper   # install our udev-helper
    206   install -v -m 0755 -o root -g root ${file} ${BINDIR}/lib/udev/${udevhelper} || die   install -v -m 0755 -o root -g root ${file} ${BINDIR}${udevdir}/${udevhelper} || die
    207  }  }
    208    
    209  minstallhalinformation()  minstallhalinformation()
    # Line 794  minstallunit() Line 796  minstallunit()
    796  {  {
    797   local unit   local unit
    798   local file   local file
    799   local prefix   local systemdunitdir="/usr/lib/systemd/system"
    800    
    801   [[ -z "$1" ]] && die "No unit given"   [[ -z "$1" ]] && die "No unit given"
    802    
      # get the right prefix for newer systemd  
      [[ -x /bin/systemctl ]] && prefix=""  
      [[ -x /usr/bin/systemctl ]] && prefix="/usr"  
       
    803   # if no fullpath given use file from sourcedir   # if no fullpath given use file from sourcedir
    804   if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]   if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
    805   then   then
    # Line 818  minstallunit() Line 816  minstallunit()
    816   fi   fi
    817    
    818   # needed directory   # needed directory
    819   install -d ${BINDIR}${prefix}/lib/systemd/system || die   install -d ${BINDIR}${prefix}${systemdunitdir} || die
    820    
    821   # install our initscript   # install our initscript
    822   install -v -m 0644 -o root -g root ${file} ${BINDIR}${prefix}/lib/systemd/system/${unit} || die   install -v -m 0644 -o root -g root ${file} ${BINDIR}${prefix}${systemdunitdir}/${unit} || die
    823  }  }
    824    
    825  # installs systemd tmp configs to /etc/tmpfiles.d  # installs systemd tmp configs to /etc/tmpfiles.d
    Legend:
    Removed from v.12654  
    changed lines
      Added in v.12655