Changing after-install hooks to add resolver after files.

azukiapp · Sep 29, 2014 · 23c0829 · 23c0829
1 parent 2e4a8f1
commit 23c0829
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/SConstruct b/SConstruct
@@ -110,4 +110,4 @@ env.Alias('cmocka' , cmocka)
 env.Alias('test'   , cares + cmocka + test_app)
 env.Alias('pack'   , cares + so_pack)
 env.Alias('install', cares + ['/azk/lib'])
-env.Alias('local-install', cares + ['/usr/lib'])
+env.Alias('local-install', cares + [install_dirs['local']])
diff --git a/mocker/nsswitch.conf b/mocker/nsswitch.conf
@@ -8,7 +8,7 @@ passwd:         compat
 group:          compat
 shadow:         compat
 
-hosts:          files dns resolver
+hosts:          files resolver dns
 networks:       files
 
 protocols:      db files

diff --git a/scripts/after-install.sh b/scripts/after-install.sh
@@ -16,7 +16,7 @@ install_resolver() {
 
     log "Adding resolver from $file"
     if ! grep -qe "hosts:.*\sresolver$" -e "hosts:.*\sresolver\s" $file ; then
-      sed -i -re 's/^(hosts: .*)$/\1 resolver/' $file
+      sed -i -re 's/^(hosts: .*files)(.*)$/\1 resolver\2/' $file
     fi;
 }