From: Bdale Garbee Date: Thu, 9 Sep 2010 19:54:43 +0000 (-0600) Subject: fix postinst code issue when /var/lib/sudo already exists X-Git-Tag: debian/1.7.4p4-3~2 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=23c751eff8a1f3538315e01224d193c97b0a5575;p=debian%2Fsudo fix postinst code issue when /var/lib/sudo already exists --- diff --git a/debian/changelog b/debian/changelog index 9c7c80a..06a38d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sudo (1.7.4p4-3) unstable; urgency=low + + * make postinst clause for handling /var/run -> /var/lib transition less + fragile, closes: #585514 + + -- Bdale Garbee Thu, 09 Sep 2010 13:54:25 -0600 + sudo (1.7.4p4-2) unstable; urgency=low * add a NEWS item about change in $HOME handling that impacts programs diff --git a/debian/sudo-ldap.postinst b/debian/sudo-ldap.postinst index 9a539d9..c70c938 100644 --- a/debian/sudo-ldap.postinst +++ b/debian/sudo-ldap.postinst @@ -33,9 +33,9 @@ if ( ! -f "/etc/sudoers") { # handle state directory transition from /var/run/sudo to /var/lib/sudo, # moving any existing content over to avoid re-lecturing existing users if ( -d "/var/run/sudo") { - system ('mkdir -p /var/lib/sudo'); - system ('mv /var/run/sudo/* /var/lib/sudo/'); - system ('rmdir /var/run/sudo'); + system ('mkdir -p /var/lib/sudo'); + system ('(cd /var/run/sudo ; tar cf - *) | (cd /var/lib/sudo ; tar xf -)'); + system ('rm -rf /var/run/sudo'); } # make sure sudoers has the correct permissions and owner/group diff --git a/debian/sudo.postinst b/debian/sudo.postinst index 10dc14a..a6f64ce 100644 --- a/debian/sudo.postinst +++ b/debian/sudo.postinst @@ -33,9 +33,9 @@ if ( ! -f "/etc/sudoers") { # handle state directory transition from /var/run/sudo to /var/lib/sudo, # moving any existing content over to avoid re-lecturing existing users if ( -d "/var/run/sudo") { - system ('mkdir -p /var/lib/sudo'); - system ('mv /var/run/sudo/* /var/lib/sudo/'); - system ('rmdir /var/run/sudo'); + system ('mkdir -p /var/lib/sudo'); + system ('(cd /var/run/sudo ; tar cf - *) | (cd /var/lib/sudo ; tar xf -)'); + system ('rm -rf /var/run/sudo'); } # make sure sudoers has the correct permissions and owner/group