From a5c52c00c16be69e14360222520129d30f76e042 Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Thu, 30 Jul 2020 22:10:35 +0200 Subject: Align Makefile and tree structure with upstream tree structure Instead of placing the custom files with the upstream files it seems clearer to have them mostly separated. This makes it easier to see which parts are custom and which parts are more or less upstream. As a result the upstream Makefile only needed minor changes to accomodate this. The Makefile is NOT bug free, unfortunately it doesn't always do the right thing, this due to inexperience. --- mageia/usr/sbin/hibernate-cleanup.sh | 121 +++++++++++++++++++++++++++++++++++ mageia/usr/sbin/listhome | 7 ++ mageia/usr/sbin/mdv-network-event | 15 +++++ mageia/usr/sbin/vpn-start | 36 +++++++++++ mageia/usr/sbin/vpn-stop | 18 ++++++ 5 files changed, 197 insertions(+) create mode 100755 mageia/usr/sbin/hibernate-cleanup.sh create mode 100644 mageia/usr/sbin/listhome create mode 100755 mageia/usr/sbin/mdv-network-event create mode 100755 mageia/usr/sbin/vpn-start create mode 100755 mageia/usr/sbin/vpn-stop (limited to 'mageia/usr/sbin') diff --git a/mageia/usr/sbin/hibernate-cleanup.sh b/mageia/usr/sbin/hibernate-cleanup.sh new file mode 100755 index 00000000..49451859 --- /dev/null +++ b/mageia/usr/sbin/hibernate-cleanup.sh @@ -0,0 +1,121 @@ +#!/bin/sh + +# This script invalidates any stale swsusp and Software Suspend 2 images. It +# searches all swap partitions on your machine, as well as Suspend2's +# filewriter files (by way of the hibernate script telling it where to find +# it). +# +# It should be called on boot, after mounting filesystems, but before enabling +# swap or clearing out /var/run. Copy this into /etc/init.d/ (or the appropriate +# place on your system), then add a symlink at the appropriate point on boot. +# On a Debian system, you would do this: +# update-rc.d hibernate-cleanup.sh start 31 S . +# +# On other SysV-based systems, you would do something like: +# ln -s ../init.d/hibernate-cleanup.sh /etc/rcS.d/S31hibernate-cleanup.sh + +HIBERNATE_FILEWRITER_TRAIL="/var/run/suspend2_filewriter_image_exists" + +get_part_label() { + local ID_FS_LABEL + + eval "$(vol_id -x $1 2> /dev/null)" + echo "$ID_FS_LABEL" +} + +get_part_uuid() { + local ID_FS_UUID + + eval "$(vol_id -x $1 2> /dev/null)" + echo "$ID_FS_UUID" +} + +get_swap_id() { + local line + fdisk -l 2>/dev/null | while read line; do + case "$line" in + /*Linux\ [sS]wap*) echo "${line%% *}" + esac + done +} + +clear_swap() { + local where wason label uuid + where=$1 + wason= + test x"$2" = x || label="-L $2" + test x"$3" = x || uuid="-U $3" + swapoff $where 2>/dev/null && wason=yes + mkswap $where $label $uuid > /dev/null || echo -n " (failed: $?)" + [ -n "$wason" ] && swapon $where +} + +check_swap_sig() { + local part="$(get_swap_id)" + local where what type rest p c dev label + while read where what type rest ; do + test "$type" = "swap" || continue + c=continue + dev= + label= + for p in $part ; do + case "$where" in + LABEL=* ) + test x"$(get_part_label $p)" = x"${where#LABEL=}" && { + c=: + dev=$p + label=${where#LABEL=} + } + ;; + UUID=* ) + test x"$(get_part_uuid $p)" = x"${where#UUID=}" && { + c=: + dev=$p + uuid=${where#UUID=} + } + ;; + * ) + test "$p" = "$where" && { + c=: + dev=$p + } + ;; + esac + done + $c + case "$(dd if=$dev bs=1 count=6 skip=4086 2>/dev/null)" in + ULSUSP|S1SUSP|S2SUSP|pmdisk|[zZ]*) + echo -n "$dev" + clear_swap $dev "$label" "$uuid" + echo -n ", " + esac + done < /etc/fstab +} + +check_filewriter_sig() { + local target + [ -f "$HIBERNATE_FILEWRITER_TRAIL" ] || return + read target < $HIBERNATE_FILEWRITER_TRAIL + [ -f "$target" ] || return + case "`dd \"if=$target\" bs=8 count=1 2>/dev/null`" in + HaveImag) + /bin/echo -ne "Suspend2\n\0\0" | dd "of=$target" bs=11 count=1 conv=notrunc 2>/dev/null + echo -n "$target, " + rm -f $HIBERNATE_FILEWRITER_TRAIL + esac +} + +case "$1" in +start) + echo -n "Invalidating stale software suspend images... " + check_swap_sig + check_filewriter_sig + echo "done." + ;; +stop|restart|force-reload) + ;; +*) + echo "Usage: /etc/init.d/hibernate {start|stop|restart|force-reload}" +esac + +exit 0 diff --git a/mageia/usr/sbin/listhome b/mageia/usr/sbin/listhome new file mode 100644 index 00000000..733dbe08 --- /dev/null +++ b/mageia/usr/sbin/listhome @@ -0,0 +1,7 @@ +#!/bin/sh +# Chmouel Boudjnah +# Description: List the home greather than 501 should be unusefull now, but +# here for backward compatibilities + +LC_ALL=C LANG=C LANGUAGE=C \ +perl -n -e 'while(my @list=getpwent){print $list[-2], "\n" unless $list[2] <= 999}' < /etc/passwd diff --git a/mageia/usr/sbin/mdv-network-event b/mageia/usr/sbin/mdv-network-event new file mode 100755 index 00000000..705361b7 --- /dev/null +++ b/mageia/usr/sbin/mdv-network-event @@ -0,0 +1,15 @@ +#!/bin/sh +# usage "mdv-network-event + +EVENT=$1 +INTERFACE=$2 +if [ -z "$EVENT" ] || [ -z "$INTERFACE" ] || [ ! -x /usr/bin/dbus-send ]; then + exit +fi + +/usr/bin/dbus-send --system --type=signal \ + /org/mageia/network/status \ + org.mageia.network.status \ + "string:$EVENT" \ + "string:$INTERFACE" \ + 2>/dev/null diff --git a/mageia/usr/sbin/vpn-start b/mageia/usr/sbin/vpn-start new file mode 100755 index 00000000..49a02cf1 --- /dev/null +++ b/mageia/usr/sbin/vpn-start @@ -0,0 +1,36 @@ +#!/bin/sh + +TYPE=$1 +NAME=$2 +shift 2 +if [ -z "$TYPE" ] || [ -z "$NAME" ]; then + echo "usage: $0: [parameters]" +fi + +DIR=/etc/sysconfig/network-scripts/vpn.d/"$TYPE" +CONFIG="$DIR"/"$NAME".conf +PID=/var/run/"$TYPE"-"$NAME".pid + +. /etc/init.d/functions + +if pidofproc "$PID" >/dev/null; then + gprintf "Connection is already started, please stop it first.\n" + exit 1 +fi + +case $TYPE in + pptp) + gprintf "No implementation for connection type $TYPE yet.\n"; + exit 1 + ;; + openvpn) + action "Starting VPN connection: " openvpn --user openvpn --group openvpn --daemon --writepid $PID --config $CONFIG --cd $DIR $* + ;; + vpnc) + action "Starting VPN connection: " /usr/sbin/vpnc $CONFIG --pid-file $PID $* + ;; + *) + gprintf "Connection type $TYPE is not supported.\n"; + exit 1 + ;; +esac diff --git a/mageia/usr/sbin/vpn-stop b/mageia/usr/sbin/vpn-stop new file mode 100755 index 00000000..048c909f --- /dev/null +++ b/mageia/usr/sbin/vpn-stop @@ -0,0 +1,18 @@ +#!/bin/sh + +TYPE=$1 +NAME=$2 +if [ -z "$TYPE" ] || [ -z "$NAME" ]; then + echo "usage: $0: " +fi + +PID=/var/run/"$TYPE"-"$NAME".pid + +. /etc/init.d/functions +if [ -e "$PID" ]; then + gprintf "Stopping VPN connection: " + killproc -p "$PID" + echo +else + gprintf "Connection isn't started.\n" +fi -- cgit v1.2.1