Add nsswitch.conf and fix a mistake in get-answerfile to make netinstall work

diff --git a/target/generic/target_xenclient_installer_skeleton/etc/nsswitch.conf b/target/generic/target_xenclient_installer_skeleton/etc/nsswitch.conf
new file mode 100644 (file)
index 0000000..448777e
--- /dev/null
+++ b/target/generic/target_xenclient_installer_skeleton/etc/nsswitch.conf
@@ -0,0 +1,4 @@
+passwd: files
+shadow: files
+group:  files
+hosts:  files

diff --git a/target/generic/target_xenclient_installer_skeleton/install/stages/Get-answerfile b/target/generic/target_xenclient_installer_skeleton/install/stages/Get-answerfile
index 007eb94765741742ae605ca29b62a3065c96cb44..744b0154b88057b30048f95ab654dc40741118f7 100755 (executable)
--- a/target/generic/target_xenclient_installer_skeleton/install/stages/Get-answerfile
+++ b/target/generic/target_xenclient_installer_skeleton/install/stages/Get-answerfile
@@ -99,7 +99,7 @@ else
     case "${PROTOCOL}" in
     tftp) 
            REMOTE_LEAF=$(echo ${ANSWERFILE_OPT} | sed -e 's/^tftp:\/\/[^\/]*\///g' )
-           REMOTE_HOST=$(echo ${ANSWERFILE_OPT} | sed -ne 's/^tftp:\/\/\([^\/]*\)\///p' )
+           REMOTE_HOST=$(echo ${ANSWERFILE_OPT} | sed -ne 's/^tftp:\/\/\([^\/]*\)\/.*$/\1/p' )
            if [ -z "$REMOTE_HOST" ]; then
                REMOTE_HOST="dhcp"
            fi