diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-08-09 14:18:17 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2011-08-09 14:18:17 -0400 |
| commit | 4ee50f81e1f2f78af3298439ab8a9d9d96aa4d18 (patch) | |
| tree | b263e00bd7a93fd1f1a69a4a497d8e66dedf96ef | |
| parent | 53da81415a777306647251c68f64d073ec763531 (diff) | |
| download | initscripts-4ee50f81e1f2f78af3298439ab8a9d9d96aa4d18.tar initscripts-4ee50f81e1f2f78af3298439ab8a9d9d96aa4d18.tar.gz initscripts-4ee50f81e1f2f78af3298439ab8a9d9d96aa4d18.tar.bz2 initscripts-4ee50f81e1f2f78af3298439ab8a9d9d96aa4d18.tar.xz initscripts-4ee50f81e1f2f78af3298439ab8a9d9d96aa4d18.zip | |
Drop fedora-autoswap; it's somewhat dangerous, and better done via a udev/systemd combination anyway.
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | systemd/fedora-autoswap | 18 | ||||
| -rw-r--r-- | systemd/system/fedora-autoswap.service | 12 |
3 files changed, 0 insertions, 31 deletions
@@ -124,7 +124,6 @@ install: mkdir -p -m 755 $(ROOT)/lib/systemd/system/sysinit.target.wants ln -s ../fedora-configure.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-loadmodules.service $(ROOT)/lib/systemd/system/basic.target.wants - ln -s ../fedora-autoswap.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-autorelabel.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-autorelabel-mark.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-readonly.service $(ROOT)/lib/systemd/system/local-fs.target.wants diff --git a/systemd/fedora-autoswap b/systemd/fedora-autoswap deleted file mode 100755 index ea392909..00000000 --- a/systemd/fedora-autoswap +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# Support automatic swapon. -# - -. /etc/init.d/functions - -if [ "$AUTOSWAP" = "yes" ]; then - curswap=$(awk '/^\/dev/ { print $1 }' /proc/swaps | while read x; do get_numeric_dev dec $x ; echo -n " "; done) - swappartitions=$(blkid -t TYPE=swap -o device) - if [ x"$swappartitions" != x ]; then - for partition in $swappartitions ; do - [ ! -e $partition ] && continue - majmin=$(get_numeric_dev dec $partition) - echo $curswap | grep -qw "$majmin" || action $"Enabling local swap partitions: " swapon $partition - done - fi -fi diff --git a/systemd/system/fedora-autoswap.service b/systemd/system/fedora-autoswap.service deleted file mode 100644 index 21754c9c..00000000 --- a/systemd/system/fedora-autoswap.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Enable all detected swap partitions -DefaultDependencies=no -Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target -Before=swap.target shutdown.target - -[Service] -ExecStart=/lib/systemd/fedora-autoswap -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes |