summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonas <jonas@8f53b18a-e215-0410-8885-9f593d34873e>2006-06-10 20:11:54 +0000
committerjonas <jonas@8f53b18a-e215-0410-8885-9f593d34873e>2006-06-10 20:11:54 +0000
commit96a365654612b25cc40a1175ec2ab35bb2c7dbc0 (patch)
tree89442dad1633990742161a5122ac6acf4847624a
parentc1ab8e0c5c79cd07a1640c8f9baa8a5c3f84431b (diff)
resolvconf need similar workaround as ifupdown.
git-svn-id: svn+ssh://xayide/home/jonas/private_svn/fleshybrid/trunk@8 8f53b18a-e215-0410-8885-9f593d34873e
-rwxr-xr-x1_makerootfs.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/1_makerootfs.sh b/1_makerootfs.sh
index 839643a..e00c0b8 100755
--- a/1_makerootfs.sh
+++ b/1_makerootfs.sh
@@ -179,10 +179,12 @@ if [ -n "$aptitude_install_custom" ]; then
fi
# ifupdown temporarily installs a dir, but cannot replace with symlink later due to rad-only rootfs
-if [ -d "$targettemp/etc/network/run" ] && [ ! -L "$targettemp/etc/network/run" ]; then
- rm -f "$targettemp/etc/network/run"
- ln -s /dev/shm/network "$targettemp/etc/network/run"
-fi
+for context in network resolvconf; do
+ if [ -d "$targettemp/etc/$context/run" ] && [ ! -L "$targettemp/etc/$context/run" ]; then
+ rm -f "$targettemp/etc/$context/run"
+ ln -s "/dev/shm/$context" "$targettemp/etc/$context/run"
+ fi
+done
# Remove hack to suppress warnings about insecure install
rm -f "$targettemp/etc/apt/apt.conf.d/99localforcedautoinstall"