public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch-to-configuration: Handle multiple swap devices properly

Browse Source
This commit is contained in:
Eelco Dolstra 2012-10-12 16:37:14 -04:00
parent b968244aa1
commit fd7dbc99ab
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
modules/system/activation/switch-to-configuration.pl
View File

@ -64,15 +64,19 @@ sub getActiveUnits {
sub parseFstab { sub parseFstab {
my ($filename) = @_; my ($filename) = @_;
my %res; my ($fss, $swaps);
foreach my $line (read_file($filename, err_mode => 'quiet')) { foreach my $line (read_file($filename, err_mode => 'quiet')) {
chomp $line; chomp $line;
$line =~ s/#.*//; $line =~ s/#.*//;
next if $line =~ /^\s*$/; next if $line =~ /^\s*$/;
my @xs = split / /, $line; my @xs = split / /, $line;
$res{$xs[1]} = { device => $xs[0], fsType => $xs[2], options => $xs[3] // "" }; if ($xs[2] eq "swap") {
$swaps->{$xs[0]} = { options => $xs[3] // "" };
} else {
$fss->{$xs[1]} = { device => $xs[0], fsType => $xs[2], options => $xs[3] // "" };
}
} }
return %res; return ($fss, $swaps);
} }
sub parseUnit { sub parseUnit {
@ -187,26 +191,18 @@ sub unique {
# Compare the previous and new fstab to figure out which filesystems # Compare the previous and new fstab to figure out which filesystems
# need a remount or need to be unmounted. New filesystems are mounted # need a remount or need to be unmounted. New filesystems are mounted
# automatically by starting local-fs.target. Also handles swap # automatically by starting local-fs.target. FIXME: might be nicer if
# devices. FIXME: might be nicer if we generated units for all # we generated units for all mounts; then we could unify this with the
# mounts; then we could unify this with the unit checking code above. # unit checking code above.
my %prevFstab = parseFstab "/etc/fstab"; my ($prevFss, $prevSwaps) = parseFstab "/etc/fstab";
my %newFstab = parseFstab "@out@/etc/fstab"; my ($newFss, $newSwaps) = parseFstab "@out@/etc/fstab";
foreach my $mountPoint (keys %prevFstab) { foreach my $mountPoint (keys ${prevFss}) {
my $prev = $prevFstab{$mountPoint}; my $prev = $prevFss->{$mountPoint};
my $new = $newFstab{$mountPoint}; my $new = $newFss->{$mountPoint};
my $unit = pathToUnitName($mountPoint). ".mount" if $prev->{fsType} ne "swap"; my $unit = pathToUnitName($mountPoint) . ".mount";
if (!defined $new) { if (!defined $new) {
if ($prev->{fsType} eq "swap") { # Filesystem entry disappeared, so unmount it.
# Swap entry disappeared, so turn it off. Can't use push @unitsToStop, $unit;
# "systemctl stop" here because systemd has lots of alias
# units that prevent a stop from actually calling
# "swapoff".
system("@utillinux@/sbin/swapoff", $prev->{device});
} else {
# Filesystem entry disappeared, so unmount it.
push @unitsToStop, $unit;
}
} elsif ($prev->{fsType} ne $new->{fsType} || $prev->{device} ne $new->{device}) { } elsif ($prev->{fsType} ne $new->{fsType} || $prev->{device} ne $new->{device}) {
# Filesystem type or device changed, so unmount and mount it. # Filesystem type or device changed, so unmount and mount it.
write_file($restartListFile, { append => 1 }, "$unit\n"); write_file($restartListFile, { append => 1 }, "$unit\n");
@ -217,6 +213,21 @@ foreach my $mountPoint (keys %prevFstab) {
} }
} }
# Also handles swap devices.
foreach my $device (keys ${prevSwaps}) {
my $prev = $prevSwaps->{$device};
my $new = $newSwaps->{$device};
if (!defined $new) {
# Swap entry disappeared, so turn it off. Can't use
# "systemctl stop" here because systemd has lots of alias
# units that prevent a stop from actually calling
# "swapoff".
print STDERR "stopping swap device: $device\n";
system("@utillinux@/sbin/swapoff", $device);
}
# FIXME: update swap options (i.e. its priority).
}
if (scalar @unitsToStop > 0) { if (scalar @unitsToStop > 0) {
@unitsToStop = unique(@unitsToStop); @unitsToStop = unique(@unitsToStop);
print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n"; print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n";