Skip to content

Loading…

resolvconf: rewrite and fix this stupid package #28

Merged
merged 2 commits into from

2 participants

@v4hn
Lunar Linux member

No description provided.

@Ratler
Lunar Linux member

This line is not compatible with sysvinit. Also you should mkdir /run/resolvconf in POST_BUILD or similar unless you want to reboot for systemd to create the directory.

Lunar Linux member
Lunar Linux member

It's always the line above, at least if you check on github.com. But yes, it's about /run. Ah didn't know the things in POST_INSTALL actually create the run/ directories etc. Just keep in mind they will be lost for anyone also running sysvinit.

@Ratler Ratler merged commit 18aec80 into lunar-linux:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
View
21 utils/resolvconf/BUILD
@@ -1,8 +1,27 @@
(
+ # move the package to /usr
+ sedit "s@\(PATH=.*\)@\1:/usr/bin@" bin/resolvconf &&
+ sedit "s@\(PATH=/sbin:/bin\)@\1:/usr/bin@" etc/resolvconf/update.d/libc &&
+ sedit "s@\(/lib/resolvconf/list-records\)@/usr\1@" etc/resolvconf/update.d/* &&
+
prepare_install &&
- install -m755 bin/resolvconf bin/list-records /bin/ &&
+
+ install -Dm0755 bin/resolvconf /usr/bin/ &&
+ install -Dm0755 bin/list-records /usr/lib/resolvconf/list-records &&
+
cp -rv etc/resolvconf /etc/ &&
+ ln -sf /var/run/resolvconf/ /etc/resolvconf/run &&
+
+ # backup original resolv.conf
+ if [ ! -e /etc/resolv.conf ] || [ ! -L /etc/resolv.conf ]; then
+ if [ -e /etc/resolv.conf ]; then
+ mv /etc/resolv.conf /etc/resolvconf/resolv.conf.d/original
+ fi &&
+ # /etc/resolv.conf is protected and will not be listed in install
+ ln -s /etc/resolvconf/run/resolv.conf /etc/resolv.conf
+ fi &&
+
install -m644 man/resolvconf.8 /usr/share/man/man8/ &&
install -m644 man/interface-order.5 /usr/share/man/man5/
View
8 utils/resolvconf/POST_INSTALL
@@ -0,0 +1,8 @@
+resolvconf --create-runtime-directories &&
+resolvconf -u &&
+resolvconf --enable-updates &&
+
+# provide the old resolvconf entries until the file is regenerated
+if [ -e /etc/resolvconf/resolv.conf.d/original ]; then
+ cat /etc/resolvconf/resolv.conf.d/original >> /etc/resolv.conf
+fi
View
10 utils/resolvconf/PRE_REMOVE
@@ -0,0 +1,10 @@
+resolvconf --wipe-runtime-directories &&
+rmdir "`readlink /etc/resolvconf/run`" &&
+
+if [ -L /etc/resolv.conf ] && [ "`readlink /etc/resolv.conf`" = "/etc/resolvconf/run/resolv.conf" ]; then
+ rm /etc/resolv.conf
+fi &&
+
+if [ -e /etc/resolvconf/resolv.conf.d/original ]; then
+ cp /etc/resolvconf/resolv.conf.d/original /etc/resolv.conf
+fi
View
3 utils/resolvconf/tmpfiles.d/resolvconf.conf
@@ -0,0 +1,3 @@
+d /var/run/resolvconf 0755 root root
+d /var/run/resolvconf/interface 0755 root root
+f /var/run/resolvconf/enable-updates 0644 root root
Something went wrong with that request. Please try again.