Magellan Linux

  • Back to homepage
    • /[smage]/branches/magellan-next/core/systemd/systemd-28-r2.smage2

    Diff of /branches/magellan-next/core/systemd/systemd-28-r2.smage2

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

    revision 7872 by niro, Thu Jun 2 19:46:59 2011 UTC revision 7958 by niro, Sun Jun 5 21:02:23 2011 UTC
    # Line 20  DEPEND=">= sys-apps/dbus-1.4 Line 20  DEPEND=">= sys-apps/dbus-1.4
    20   >= sys-apps/tcp-wrappers-7.6   >= sys-apps/tcp-wrappers-7.6
    21   >= sys-libs/pam-1.1   >= sys-libs/pam-1.1
    22   >= sys-libs/libcap-2.20   >= sys-libs/libcap-2.20
    23   >= sys-apps/util-linux-2.19"   >= sys-apps/util-linux-2.19
    24     >= sys-apps/shadow-4.1"
    25    
    26  if [[ ${SYSVINIT_SUPPORT} = y ]]  if [[ ${SYSVINIT_SUPPORT} = y ]]
    27  then  then
    # Line 154  postinstall() Line 155  postinstall()
    155   # and symlink what we found to the new-style default.target   # and symlink what we found to the new-style default.target
    156   ln -snf ${target} ${MROOT}/etc/systemd/system/default.target   ln -snf ${target} ${MROOT}/etc/systemd/system/default.target
    157    
    158     # convert modules.autoload
    159     local modules
    160     # get only lines which are not commented or empty;
    161     # if we get any items than the modules.autoload is in use
    162     modules=$(sed -e '/^#/d' -e '/^$/d' ${MROOT}/etc/modules.autoload)
    163     if [[ ! -z ${modules} ]]
    164     then
    165     [ ! -d ${MROOT}/etc/modules-load.d ] && install -d ${MROOT}/etc/modules-load.d
    166     echo -e "# Converted by systemd install from /etc/modules.autoload\n#\n#" \
    167     > ${MROOT}/etc/modules-load.d/modules.autoload.conf
    168     cat  ${MROOT}/etc/modules.autoload \
    169     >> ${MROOT}/etc/modules-load.d/modules.autoload.conf
    170     fi
    171    
    172     # check mtab, and replace with a symlink if requiered
    173     if [[ ! -L ${MROOT}/etc/mtab ]] || \
    174     [[ $(readlink ${MROOT}/etc/mtab) != /proc/self/mounts ]]
    175     then
    176     ln -snf /proc/self/mounts ${MROOT}/etc/mtab
    177     fi
    178    
    179   if [[ -z ${MROOT} ]] ||  [[ ${MROOT} = / ]]   if [[ -z ${MROOT} ]] ||  [[ ${MROOT} = / ]]
    180   then   then
    181   # create machine-id   # create machine-id
    Legend:
    Removed from v.7872  
    changed lines
      Added in v.7958