diff options
| author | smcv <smcv@web> | 2018-03-21 19:07:17 -0400 |
|---|---|---|
| committer | admin <admin@branchable.com> | 2018-03-21 19:07:17 -0400 |
| commit | 0b81eac00e46b1c918ddd871a4a4380c89c331f7 (patch) | |
| tree | d3abaec70bb754abd147cad05da9dcab45227b7f /doc/bugs/ikiwiki-mass-rebuild_has_probably_never_worked_portably.mdwn | |
| parent | ff2a4792a540ce6cb13ae0f5519390f25c0388b7 (diff) | |
| download | ikiwiki-0b81eac00e46b1c918ddd871a4a4380c89c331f7.tar ikiwiki-0b81eac00e46b1c918ddd871a4a4380c89c331f7.tar.gz | |
Indent patch (fenced blocks don't work on this particular ikiwiki installation)
Diffstat (limited to 'doc/bugs/ikiwiki-mass-rebuild_has_probably_never_worked_portably.mdwn')
| -rw-r--r-- | doc/bugs/ikiwiki-mass-rebuild_has_probably_never_worked_portably.mdwn | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/doc/bugs/ikiwiki-mass-rebuild_has_probably_never_worked_portably.mdwn b/doc/bugs/ikiwiki-mass-rebuild_has_probably_never_worked_portably.mdwn index 2cc7ae957..4b1394a67 100644 --- a/doc/bugs/ikiwiki-mass-rebuild_has_probably_never_worked_portably.mdwn +++ b/doc/bugs/ikiwiki-mass-rebuild_has_probably_never_worked_portably.mdwn @@ -2,21 +2,19 @@ As best as I can recall, running ikiwiki-mass-rebuild as root has never worked f The following patch works much better on the aforementioned platforms, as well as CentOS 6: -``` -diff --git ikiwiki-mass-rebuild ikiwiki-mass-rebuild -index ce4e084e8..2ff33b493 100755 ---- ikiwiki-mass-rebuild -+++ ikiwiki-mass-rebuild -@@ -32,7 +32,7 @@ sub processuser { - my $user=shift; - return if $user=~/^-/ || $users{$user}; - $users{$user}=1; -- my $ret=system("su", $user, "-s", "/bin/sh", "-c", "--", "$0 --nonglobal @ARGV"); -+ my $ret=system("su", "-m", $user, "-c", "/bin/sh -c -- '$0 --nonglobal @ARGV'"); - if ($ret != 0) { - print STDERR "warning: processing for $user failed with code $ret\n"; - } -``` + diff --git ikiwiki-mass-rebuild ikiwiki-mass-rebuild + index ce4e084e8..2ff33b493 100755 + --- ikiwiki-mass-rebuild + +++ ikiwiki-mass-rebuild + @@ -32,7 +32,7 @@ sub processuser { + my $user=shift; + return if $user=~/^-/ || $users{$user}; + $users{$user}=1; + - my $ret=system("su", $user, "-s", "/bin/sh", "-c", "--", "$0 --nonglobal @ARGV"); + + my $ret=system("su", "-m", $user, "-c", "/bin/sh -c -- '$0 --nonglobal @ARGV'"); + if ($ret != 0) { + print STDERR "warning: processing for $user failed with code $ret\n"; + } The `-m` may be overzealous. I have some sites running as users with `/sbin/nologin` for a shell, and this allows running a command as those users, though without some typical environment variables. This is probably wrong. Maybe I should be doing something else to limit shell access for those users, and the su arg should instead be `-`. |