Merge branch 'testing' of git@linhes.org:linhes_dev into testing

Conflicts:
	build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
	build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks

9 files changed, 69 insertions, 6 deletions

diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
index 62e79fc..8a8f7cf 100644
--- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
@@ -155,6 +155,7 @@ expect
 curl
 dnsutils
 avahi
+nss-mdns
 
 #Wireless
 b43-fwcutter
@@ -217,7 +218,8 @@ linux-firmware
 
 larch-live
 mkinitcpio-busybox
-windowmaker-crm-git
+#windowmaker-crm-git
+windowmaker
 xcursor-themes
 ceton
 ceton-scripts
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf
index 1d2bb7f..43a275f 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf
+++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf
@@ -15,7 +15,7 @@
 # CONSOLEMAP: found in /usr/share/kbd/consoletrans
 # USECOLOR: use ANSI color sequences in startup messages
 #
-LOCALE="en_US.utf8"
+LOCALE="en_US.utf-8"
 HARDWARECLOCK="UTC"
 TIMEZONE="US/Central"
 KEYMAP="us"
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/nsswitch.conf b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/nsswitch.conf
new file mode 100644
index 0000000..2c66b68
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/nsswitch.conf
@@ -0,0 +1,19 @@
+# Begin /etc/nsswitch.conf
+
+passwd: files
+group: files
+shadow: files
+
+publickey: files
+
+hosts: files mdns4_minimal dns mdns4
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files
+
+# End /etc/nsswitch.conf
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
index 62e79fc..8a8f7cf 100644
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
@@ -155,6 +155,7 @@ expect
 curl
 dnsutils
 avahi
+nss-mdns
 
 #Wireless
 b43-fwcutter
@@ -217,7 +218,8 @@ linux-firmware
 
 larch-live
 mkinitcpio-busybox
-windowmaker-crm-git
+#windowmaker-crm-git
+windowmaker
 xcursor-themes
 ceton
 ceton-scripts
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf
index 1d2bb7f..43a275f 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf
@@ -15,7 +15,7 @@
 # CONSOLEMAP: found in /usr/share/kbd/consoletrans
 # USECOLOR: use ANSI color sequences in startup messages
 #
-LOCALE="en_US.utf8"
+LOCALE="en_US.utf-8"
 HARDWARECLOCK="UTC"
 TIMEZONE="US/Central"
 KEYMAP="us"
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/nsswitch.conf b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/nsswitch.conf
new file mode 100644
index 0000000..2c66b68
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/nsswitch.conf
@@ -0,0 +1,19 @@
+# Begin /etc/nsswitch.conf
+
+passwd: files
+group: files
+shadow: files
+
+publickey: files
+
+hosts: files mdns4_minimal dns mdns4
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files
+
+# End /etc/nsswitch.conf
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
index 62e79fc..8a8f7cf 100644
--- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
@@ -155,6 +155,7 @@ expect
 curl
 dnsutils
 avahi
+nss-mdns
 
 #Wireless
 b43-fwcutter
@@ -217,7 +218,8 @@ linux-firmware
 
 larch-live
 mkinitcpio-busybox
-windowmaker-crm-git
+#windowmaker-crm-git
+windowmaker
 xcursor-themes
 ceton
 ceton-scripts
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf
index 1d2bb7f..43a275f 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf
@@ -15,7 +15,7 @@
 # CONSOLEMAP: found in /usr/share/kbd/consoletrans
 # USECOLOR: use ANSI color sequences in startup messages
 #
-LOCALE="en_US.utf8"
+LOCALE="en_US.utf-8"
 HARDWARECLOCK="UTC"
 TIMEZONE="US/Central"
 KEYMAP="us"
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/nsswitch.conf b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/nsswitch.conf
new file mode 100644
index 0000000..2c66b68
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/nsswitch.conf
@@ -0,0 +1,19 @@
+# Begin /etc/nsswitch.conf
+
+passwd: files
+group: files
+shadow: files
+
+publickey: files
+
+hosts: files mdns4_minimal dns mdns4
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files
+
+# End /etc/nsswitch.conf