From 559146d86096ba0f779bfd102639d602b2e81a1a Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Thu, 30 Jul 2020 23:00:57 +0200 Subject: Move mageia specific files to the mageia/ subdirectory --- etc/profile.d/lang.csh | 129 ----------------- etc/profile.d/lang.sh | 157 --------------------- mageia/etc/profile.d/lang.csh | 129 +++++++++++++++++ mageia/etc/profile.d/lang.sh | 157 +++++++++++++++++++++ mageia/usr/lib/systemd/mandriva-save-dmesg | 4 + .../lib/systemd/system/mandriva-everytime.service | 16 +++ .../lib/systemd/system/mandriva-save-dmesg.service | 14 ++ mageia/usr/lib/tmpfiles.d/mandriva.conf | 33 +++++ usr/lib/systemd/mandriva-save-dmesg | 4 - usr/lib/systemd/system/mandriva-everytime.service | 16 --- usr/lib/systemd/system/mandriva-save-dmesg.service | 14 -- usr/lib/tmpfiles.d/mandriva.conf | 33 ----- 12 files changed, 353 insertions(+), 353 deletions(-) delete mode 100755 etc/profile.d/lang.csh delete mode 100755 etc/profile.d/lang.sh create mode 100755 mageia/etc/profile.d/lang.csh create mode 100755 mageia/etc/profile.d/lang.sh create mode 100755 mageia/usr/lib/systemd/mandriva-save-dmesg create mode 100644 mageia/usr/lib/systemd/system/mandriva-everytime.service create mode 100644 mageia/usr/lib/systemd/system/mandriva-save-dmesg.service create mode 100644 mageia/usr/lib/tmpfiles.d/mandriva.conf delete mode 100755 usr/lib/systemd/mandriva-save-dmesg delete mode 100644 usr/lib/systemd/system/mandriva-everytime.service delete mode 100644 usr/lib/systemd/system/mandriva-save-dmesg.service delete mode 100644 usr/lib/tmpfiles.d/mandriva.conf diff --git a/etc/profile.d/lang.csh b/etc/profile.d/lang.csh deleted file mode 100755 index 4978981c..00000000 --- a/etc/profile.d/lang.csh +++ /dev/null @@ -1,129 +0,0 @@ -# /etc/profile.d/lang.csh - set i18n stuff - -if (! $?LC_SOURCED) then - set LC_SOURCED=0 -endif - -foreach file ("$HOME/.i18n" /etc/locale.conf /etc/sysconfig/i18n) - if ($LC_SOURCED != 1 && -f $file ) then - eval `sed 's|=C$|=en_US|g' $file | sed 's|^#.*||' | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|' ` - setenv LC_SOURCED 1 - endif -end - -if ($LC_SOURCED == 1) then - if ($?LC_ALL && $?LANG) then - if ($LC_ALL == $LANG) then - unsetenv LC_ALL - endif - endif - - set consoletype=`/sbin/consoletype stdout` - - if ($?CHARSET) then - switch ($CHARSET) - case 8859-1: - case 8859-2: - case 8859-5: - case 8859-8: - case 8859-15: - case KOI*: - case LATIN2*: - if ( $?TERM ) then - if ( "$TERM" == "linux" ) then - if ( "$consoletype" == "vt" ) then - /bin/echo -n -e '\033(K' >/dev/tty - endif - endif - endif - breaksw - endsw - endif - if ($?SYSFONTACM) then - switch ($SYSFONTACM) - case iso01*: - case iso02*: - case iso05*: - case iso08*: - case iso15*: - case koi*: - case latin2-ucw*: - if ( $?TERM ) then - if ( "$TERM" == "linux" ) then - if ( "$consoletype" == "vt" ) then - /bin/echo -n -e '\033(K' > /dev/tty - endif - endif - endif - breaksw - endsw - endif - if ($?LANG) then - switch ($LANG) - case *.utf8*: - case *.UTF-8*: - if ( $?TERM ) then - if ( "$TERM" == "linux" ) then - if ( "$consoletype" == "vt" ) then - switch ($LANG) - case en_IN*: - breaksw - case ja*: - case ko*: - case si*: - case zh*: - case ar*: - case fa*: - case he*: - case *_IN*: - setenv LANG en_US.UTF-8 - breaksw - endsw - if ( -x /bin/unicode_start ) then - if { /sbin/consoletype fg } then - if ( $?SYSFONT ) then - if ( $?SYSFONTACM ) then - unicode_start $SYSFONT $SYSFONTACM - else - unicode_start $SYSFONT - endif - endif - endif - endif - endif - endif - endif - breaksw - case *: - if ( $?TERM ) then - if ( "$TERM" == "linux" ) then - if ( "$consoletype" == "vt" ) then - switch ($LANG) - case en_IN*: - breaksw - case ja*: - case ko*: - case si*: - case zh*: - case ar*: - case fa*: - case he*: - case *_IN*: - setenv LANG en_US - breaksw - endsw - if ( -x /bin/unicode_stop ) then - if { /sbin/consoletype fg } then - /bin/unicode_stop - endif - endif - endif - endif - endif - breaksw - endsw - endif - unsetenv SYSFONTACM - unsetenv SYSFONT - unset consoletype -endif diff --git a/etc/profile.d/lang.sh b/etc/profile.d/lang.sh deleted file mode 100755 index f90c0795..00000000 --- a/etc/profile.d/lang.sh +++ /dev/null @@ -1,157 +0,0 @@ -# /etc/profile.d/lang.sh - set i18n stuff - -# revert special console/X11 settings if needed -if [ "$LC_SOURCED_CONSOLE" = 1 -a -n "$DISPLAY" ]; then - unset LC_SOURCED - unset LC_SOURCED_CONSOLE -elif [ "$LC_SOURCED_X11" = 1 -a -z "$DISPLAY" ]; then - unset LC_SOURCED - unset LC_SOURCED_X11 -fi - -# only source one of the possible files, and in that order; -# if system wide and user config are mixed and different, umpredictable -# things will happen... -for langfile in "$HOME/.i18n" /etc/locale.conf /etc/sysconfig/i18n ; do - [ -f $langfile -a "$LC_SOURCED" != 1 ] && . $langfile && LC_SOURCED=1 && export LC_SOURCED -done - -if [ "$LC_SOURCED" = 1 ]; then - if [ -n "$LANG" ] ; then - [ "$LANG" = "C" ] && LANG="en_US" - export LANG - else - unset LANG - fi - [ -n "$LANG" ] && export LANG || unset LANG - [ -n "$LC_ADDRESS" ] && export LC_ADDRESS || unset LC_ADDRESS - [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE - [ -n "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE - [ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION || unset LC_IDENTIFICATION - [ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT || unset LC_MEASUREMENT - [ -n "$LC_MESSAGES" ] && export LC_MESSAGES || unset LC_MESSAGES - [ -n "$LC_MONETARY" ] && export LC_MONETARY || unset LC_MONETARY - [ -n "$LC_NAME" ] && export LC_NAME || unset LC_NAME - [ -n "$LC_NUMERIC" ] && export LC_NUMERIC || unset LC_NUMERIC - [ -n "$LC_PAPER" ] && export LC_PAPER || unset LC_PAPER - [ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE || unset LC_TELEPHONE - [ -n "$LC_TIME" ] && export LC_TIME || unset LC_TIME - if [ -n "$LC_ALL" ]; then - if [ "$LC_ALL" != "$LANG" ]; then - export LC_ALL - else - unset LC_ALL - fi - else - unset LC_ALL - fi - [ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE - [ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS - - if [ -n "$RPM_INSTALL_LANG" ]; then - export RPM_INSTALL_LANG - else - unset RPM_INSTALL_LANG - fi - - # XIM and keyboard stuff - [ -n "$ENC" ] && export ENC || unset ENC - [ -n "$XIM" ] && export XIM || unset XIM - [ -n "$XIM_PROGRAM" ] && export XIM_PROGRAM || unset XIM_PROGRAM - [ -n "$XMODIFIERS" ] && export XMODIFIERS || unset XMODIFIERS - [ -n "$_XKB_CHARSET" ] && export _XKB_CHARSET || unset _XKB_CHARSET - [ -n "$GTK_IM_MODULE" ] && export GTK_IM_MODULE || unset GTK_IM_MODULE - [ -n "$QT_IM_MODULE" ] && export QT_IM_MODULE || unset QT_IM_MODULE - - consoletype=$CONSOLETYPE - if [ -z "$consoletype" ]; then - consoletype=$(/sbin/consoletype stdout) - fi - - if [ -n "$CHARSET" ]; then - case $CHARSET in - 8859-1|8859-2|8859-5|8859-8|8859-15|KOI*) - if [ "$TERM" = "linux" -a "$consoletype" = "vt" ]; then - echo -n -e '\033(K' 2>/dev/null > /proc/$$/fd/0 - fi - ;; - esac - elif [ -n "$SYSFONTACM" ]; then - case $SYSFONTACM in - iso01*|iso02*|iso05*|iso08*|iso15*|koi*|latin2-ucw*) - if [ "$TERM" = "linux" -a "$consoletype" = "vt" ]; then - echo -n -e '\033(K' 2>/dev/null > /proc/$$/fd/0 - fi - ;; - esac - fi - if [ -n "$LANG" ]; then - case $LANG in - *.utf8*|*.UTF-8*) - if [ "$TERM" = "linux" ]; then - if [ "$consoletype" = "vt" ]; then - if [ -x /bin/unicode_start ] && /sbin/consoletype fg ; then - for langfile in /etc/sysconfig/i18n "$HOME/.i18n" ; do - [ -f $langfile ] && . $langfile - done - /bin/unicode_start $SYSFONT $SYSFONTACM - fi - case $LANG in - ja*) LANG=en_US.UTF-8 ;; - ko*) LANG=en_US.UTF-8 ;; - si*) LANG=en_US.UTF-8 ;; - zh*) LANG=en_US.UTF-8 ;; - ar*) LANG=en_US.UTF-8 ;; - fa*) LANG=en_US.UTF-8 ;; - he*) LANG=en_US.UTF-8 ;; - en_IN*) ;; - *_IN*) LANG=en_US.UTF-8 ;; - esac - fi - fi - ;; - *) - if [ "$TERM" = "linux" ]; then - if [ "$consoletype" = "vt" ]; then - case $LANG in - ja*) LANG=en_US ;; - ko*) LANG=en_US ;; - si*) LANG=en_US ;; - zh*) LANG=en_US ;; - ar*) LANG=en_US ;; - fa*) LANG=en_US ;; - he*) LANG=en_US ;; - en_IN*) ;; - *_IN*) LANG=en_US ;; - esac - [ -x /bin/unicode_stop ] && /sbin/consoletype fg && /bin/unicode_stop - fi - fi - ;; - esac - fi - - # handling of special cases where localization is done - # only on console or only on X11. - # when launching an xdm-like program we are not yet in X11 (so - # $DISPLAY is not defined) but obviously we will, so we check - # also $DESKTOP which is defined before calling xdm-like program - if [ -n "$DISPLAY" ]; then - if [ "$X11_NOT_LOCALIZED" = "yes" ]; then - LANGUAGE=C - LC_SOURCED_X11=1 - export LC_SOURCED_X11 - fi - elif [ -z "$DESKTOP" ]; then - if [ "$CONSOLE_NOT_LOCALIZED" = "yes" ]; then - LANGUAGE=C - LC_SOURCED_CONSOLE=1 - export LC_SOURCED_CONSOLE - fi - fi - - [ -n "$LANGUAGE" ] && export LANGUAGE - unset consoletype - -fi -unset langfile diff --git a/mageia/etc/profile.d/lang.csh b/mageia/etc/profile.d/lang.csh new file mode 100755 index 00000000..4978981c --- /dev/null +++ b/mageia/etc/profile.d/lang.csh @@ -0,0 +1,129 @@ +# /etc/profile.d/lang.csh - set i18n stuff + +if (! $?LC_SOURCED) then + set LC_SOURCED=0 +endif + +foreach file ("$HOME/.i18n" /etc/locale.conf /etc/sysconfig/i18n) + if ($LC_SOURCED != 1 && -f $file ) then + eval `sed 's|=C$|=en_US|g' $file | sed 's|^#.*||' | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|' ` + setenv LC_SOURCED 1 + endif +end + +if ($LC_SOURCED == 1) then + if ($?LC_ALL && $?LANG) then + if ($LC_ALL == $LANG) then + unsetenv LC_ALL + endif + endif + + set consoletype=`/sbin/consoletype stdout` + + if ($?CHARSET) then + switch ($CHARSET) + case 8859-1: + case 8859-2: + case 8859-5: + case 8859-8: + case 8859-15: + case KOI*: + case LATIN2*: + if ( $?TERM ) then + if ( "$TERM" == "linux" ) then + if ( "$consoletype" == "vt" ) then + /bin/echo -n -e '\033(K' >/dev/tty + endif + endif + endif + breaksw + endsw + endif + if ($?SYSFONTACM) then + switch ($SYSFONTACM) + case iso01*: + case iso02*: + case iso05*: + case iso08*: + case iso15*: + case koi*: + case latin2-ucw*: + if ( $?TERM ) then + if ( "$TERM" == "linux" ) then + if ( "$consoletype" == "vt" ) then + /bin/echo -n -e '\033(K' > /dev/tty + endif + endif + endif + breaksw + endsw + endif + if ($?LANG) then + switch ($LANG) + case *.utf8*: + case *.UTF-8*: + if ( $?TERM ) then + if ( "$TERM" == "linux" ) then + if ( "$consoletype" == "vt" ) then + switch ($LANG) + case en_IN*: + breaksw + case ja*: + case ko*: + case si*: + case zh*: + case ar*: + case fa*: + case he*: + case *_IN*: + setenv LANG en_US.UTF-8 + breaksw + endsw + if ( -x /bin/unicode_start ) then + if { /sbin/consoletype fg } then + if ( $?SYSFONT ) then + if ( $?SYSFONTACM ) then + unicode_start $SYSFONT $SYSFONTACM + else + unicode_start $SYSFONT + endif + endif + endif + endif + endif + endif + endif + breaksw + case *: + if ( $?TERM ) then + if ( "$TERM" == "linux" ) then + if ( "$consoletype" == "vt" ) then + switch ($LANG) + case en_IN*: + breaksw + case ja*: + case ko*: + case si*: + case zh*: + case ar*: + case fa*: + case he*: + case *_IN*: + setenv LANG en_US + breaksw + endsw + if ( -x /bin/unicode_stop ) then + if { /sbin/consoletype fg } then + /bin/unicode_stop + endif + endif + endif + endif + endif + breaksw + endsw + endif + unsetenv SYSFONTACM + unsetenv SYSFONT + unset consoletype +endif diff --git a/mageia/etc/profile.d/lang.sh b/mageia/etc/profile.d/lang.sh new file mode 100755 index 00000000..f90c0795 --- /dev/null +++ b/mageia/etc/profile.d/lang.sh @@ -0,0 +1,157 @@ +# /etc/profile.d/lang.sh - set i18n stuff + +# revert special console/X11 settings if needed +if [ "$LC_SOURCED_CONSOLE" = 1 -a -n "$DISPLAY" ]; then + unset LC_SOURCED + unset LC_SOURCED_CONSOLE +elif [ "$LC_SOURCED_X11" = 1 -a -z "$DISPLAY" ]; then + unset LC_SOURCED + unset LC_SOURCED_X11 +fi + +# only source one of the possible files, and in that order; +# if system wide and user config are mixed and different, umpredictable +# things will happen... +for langfile in "$HOME/.i18n" /etc/locale.conf /etc/sysconfig/i18n ; do + [ -f $langfile -a "$LC_SOURCED" != 1 ] && . $langfile && LC_SOURCED=1 && export LC_SOURCED +done + +if [ "$LC_SOURCED" = 1 ]; then + if [ -n "$LANG" ] ; then + [ "$LANG" = "C" ] && LANG="en_US" + export LANG + else + unset LANG + fi + [ -n "$LANG" ] && export LANG || unset LANG + [ -n "$LC_ADDRESS" ] && export LC_ADDRESS || unset LC_ADDRESS + [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE + [ -n "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE + [ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION || unset LC_IDENTIFICATION + [ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT || unset LC_MEASUREMENT + [ -n "$LC_MESSAGES" ] && export LC_MESSAGES || unset LC_MESSAGES + [ -n "$LC_MONETARY" ] && export LC_MONETARY || unset LC_MONETARY + [ -n "$LC_NAME" ] && export LC_NAME || unset LC_NAME + [ -n "$LC_NUMERIC" ] && export LC_NUMERIC || unset LC_NUMERIC + [ -n "$LC_PAPER" ] && export LC_PAPER || unset LC_PAPER + [ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE || unset LC_TELEPHONE + [ -n "$LC_TIME" ] && export LC_TIME || unset LC_TIME + if [ -n "$LC_ALL" ]; then + if [ "$LC_ALL" != "$LANG" ]; then + export LC_ALL + else + unset LC_ALL + fi + else + unset LC_ALL + fi + [ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE + [ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS + + if [ -n "$RPM_INSTALL_LANG" ]; then + export RPM_INSTALL_LANG + else + unset RPM_INSTALL_LANG + fi + + # XIM and keyboard stuff + [ -n "$ENC" ] && export ENC || unset ENC + [ -n "$XIM" ] && export XIM || unset XIM + [ -n "$XIM_PROGRAM" ] && export XIM_PROGRAM || unset XIM_PROGRAM + [ -n "$XMODIFIERS" ] && export XMODIFIERS || unset XMODIFIERS + [ -n "$_XKB_CHARSET" ] && export _XKB_CHARSET || unset _XKB_CHARSET + [ -n "$GTK_IM_MODULE" ] && export GTK_IM_MODULE || unset GTK_IM_MODULE + [ -n "$QT_IM_MODULE" ] && export QT_IM_MODULE || unset QT_IM_MODULE + + consoletype=$CONSOLETYPE + if [ -z "$consoletype" ]; then + consoletype=$(/sbin/consoletype stdout) + fi + + if [ -n "$CHARSET" ]; then + case $CHARSET in + 8859-1|8859-2|8859-5|8859-8|8859-15|KOI*) + if [ "$TERM" = "linux" -a "$consoletype" = "vt" ]; then + echo -n -e '\033(K' 2>/dev/null > /proc/$$/fd/0 + fi + ;; + esac + elif [ -n "$SYSFONTACM" ]; then + case $SYSFONTACM in + iso01*|iso02*|iso05*|iso08*|iso15*|koi*|latin2-ucw*) + if [ "$TERM" = "linux" -a "$consoletype" = "vt" ]; then + echo -n -e '\033(K' 2>/dev/null > /proc/$$/fd/0 + fi + ;; + esac + fi + if [ -n "$LANG" ]; then + case $LANG in + *.utf8*|*.UTF-8*) + if [ "$TERM" = "linux" ]; then + if [ "$consoletype" = "vt" ]; then + if [ -x /bin/unicode_start ] && /sbin/consoletype fg ; then + for langfile in /etc/sysconfig/i18n "$HOME/.i18n" ; do + [ -f $langfile ] && . $langfile + done + /bin/unicode_start $SYSFONT $SYSFONTACM + fi + case $LANG in + ja*) LANG=en_US.UTF-8 ;; + ko*) LANG=en_US.UTF-8 ;; + si*) LANG=en_US.UTF-8 ;; + zh*) LANG=en_US.UTF-8 ;; + ar*) LANG=en_US.UTF-8 ;; + fa*) LANG=en_US.UTF-8 ;; + he*) LANG=en_US.UTF-8 ;; + en_IN*) ;; + *_IN*) LANG=en_US.UTF-8 ;; + esac + fi + fi + ;; + *) + if [ "$TERM" = "linux" ]; then + if [ "$consoletype" = "vt" ]; then + case $LANG in + ja*) LANG=en_US ;; + ko*) LANG=en_US ;; + si*) LANG=en_US ;; + zh*) LANG=en_US ;; + ar*) LANG=en_US ;; + fa*) LANG=en_US ;; + he*) LANG=en_US ;; + en_IN*) ;; + *_IN*) LANG=en_US ;; + esac + [ -x /bin/unicode_stop ] && /sbin/consoletype fg && /bin/unicode_stop + fi + fi + ;; + esac + fi + + # handling of special cases where localization is done + # only on console or only on X11. + # when launching an xdm-like program we are not yet in X11 (so + # $DISPLAY is not defined) but obviously we will, so we check + # also $DESKTOP which is defined before calling xdm-like program + if [ -n "$DISPLAY" ]; then + if [ "$X11_NOT_LOCALIZED" = "yes" ]; then + LANGUAGE=C + LC_SOURCED_X11=1 + export LC_SOURCED_X11 + fi + elif [ -z "$DESKTOP" ]; then + if [ "$CONSOLE_NOT_LOCALIZED" = "yes" ]; then + LANGUAGE=C + LC_SOURCED_CONSOLE=1 + export LC_SOURCED_CONSOLE + fi + fi + + [ -n "$LANGUAGE" ] && export LANGUAGE + unset consoletype + +fi +unset langfile diff --git a/mageia/usr/lib/systemd/mandriva-save-dmesg b/mageia/usr/lib/systemd/mandriva-save-dmesg new file mode 100755 index 00000000..92562fcc --- /dev/null +++ b/mageia/usr/lib/systemd/mandriva-save-dmesg @@ -0,0 +1,4 @@ +#!/bin/sh + +[ -f /var/log/dmesg ] && mv -f /var/log/dmesg /var/log/dmesg.old +dmesg -s 131072 > /var/log/dmesg diff --git a/mageia/usr/lib/systemd/system/mandriva-everytime.service b/mageia/usr/lib/systemd/system/mandriva-everytime.service new file mode 100644 index 00000000..cc247dba --- /dev/null +++ b/mageia/usr/lib/systemd/system/mandriva-everytime.service @@ -0,0 +1,16 @@ +[Unit] +Description=Reconfigure the system on administrator request +DefaultDependencies=no +Conflicts=shutdown.target +Before=basic.target shutdown.target +After=local-fs.target dkms-autorebuild.service + +[Service] +ExecStart=-/etc/init.d/mandrake_everytime +Type=oneshot +TimeoutSec=0 +StandardInput=tty +RemainAfterExit=yes + +[Install] +WantedBy=basic.target diff --git a/mageia/usr/lib/systemd/system/mandriva-save-dmesg.service b/mageia/usr/lib/systemd/system/mandriva-save-dmesg.service new file mode 100644 index 00000000..386e263e --- /dev/null +++ b/mageia/usr/lib/systemd/system/mandriva-save-dmesg.service @@ -0,0 +1,14 @@ +[Unit] +Description=Save boot dmesg content +DefaultDependencies=no +Conflicts=shutdown.target +After=systemd-udev-settle.service local-fs.target +Before=shutdown.target + +[Service] +ExecStart=-/lib/systemd/mandriva-save-dmesg +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=shutdown.target diff --git a/mageia/usr/lib/tmpfiles.d/mandriva.conf b/mageia/usr/lib/tmpfiles.d/mandriva.conf new file mode 100644 index 00000000..5f0c697e --- /dev/null +++ b/mageia/usr/lib/tmpfiles.d/mandriva.conf @@ -0,0 +1,33 @@ +# The following was present in rc.sysinit + +r /fsckoptions +r /.autofsck +r /halt +r /poweroff +r /.suspended +r /etc/killpower + +# The following should really go away after /run and /run/lock +# are converted to tmpfs +R /run/lock/cvs/* +R /run/screen/* + +r /tmp/.lock.* +r /tmp/.s.PGSQL.* +R /tmp/hsperfdata_* +R /tmp/kde-* +R /tmp/ksocket-* +R /tmp/mc-* +R /tmp/mcop-* +R /tmp/orbit-* +R /tmp/ssh-* +R /tmp/.fam_socket +R /tmp/.esd +R /tmp/.esd-* +R /tmp/pulse-* +R /tmp/.sawfish-* +R /tmp/esrv* +R /tmp/kio* +R /var/lib/gdm/core.* + +R /tmp/gpg-* diff --git a/usr/lib/systemd/mandriva-save-dmesg b/usr/lib/systemd/mandriva-save-dmesg deleted file mode 100755 index 92562fcc..00000000 --- a/usr/lib/systemd/mandriva-save-dmesg +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -[ -f /var/log/dmesg ] && mv -f /var/log/dmesg /var/log/dmesg.old -dmesg -s 131072 > /var/log/dmesg diff --git a/usr/lib/systemd/system/mandriva-everytime.service b/usr/lib/systemd/system/mandriva-everytime.service deleted file mode 100644 index cc247dba..00000000 --- a/usr/lib/systemd/system/mandriva-everytime.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Reconfigure the system on administrator request -DefaultDependencies=no -Conflicts=shutdown.target -Before=basic.target shutdown.target -After=local-fs.target dkms-autorebuild.service - -[Service] -ExecStart=-/etc/init.d/mandrake_everytime -Type=oneshot -TimeoutSec=0 -StandardInput=tty -RemainAfterExit=yes - -[Install] -WantedBy=basic.target diff --git a/usr/lib/systemd/system/mandriva-save-dmesg.service b/usr/lib/systemd/system/mandriva-save-dmesg.service deleted file mode 100644 index 386e263e..00000000 --- a/usr/lib/systemd/system/mandriva-save-dmesg.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Save boot dmesg content -DefaultDependencies=no -Conflicts=shutdown.target -After=systemd-udev-settle.service local-fs.target -Before=shutdown.target - -[Service] -ExecStart=-/lib/systemd/mandriva-save-dmesg -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=shutdown.target diff --git a/usr/lib/tmpfiles.d/mandriva.conf b/usr/lib/tmpfiles.d/mandriva.conf deleted file mode 100644 index 5f0c697e..00000000 --- a/usr/lib/tmpfiles.d/mandriva.conf +++ /dev/null @@ -1,33 +0,0 @@ -# The following was present in rc.sysinit - -r /fsckoptions -r /.autofsck -r /halt -r /poweroff -r /.suspended -r /etc/killpower - -# The following should really go away after /run and /run/lock -# are converted to tmpfs -R /run/lock/cvs/* -R /run/screen/* - -r /tmp/.lock.* -r /tmp/.s.PGSQL.* -R /tmp/hsperfdata_* -R /tmp/kde-* -R /tmp/ksocket-* -R /tmp/mc-* -R /tmp/mcop-* -R /tmp/orbit-* -R /tmp/ssh-* -R /tmp/.fam_socket -R /tmp/.esd -R /tmp/.esd-* -R /tmp/pulse-* -R /tmp/.sawfish-* -R /tmp/esrv* -R /tmp/kio* -R /var/lib/gdm/core.* - -R /tmp/gpg-* -- cgit v1.2.1