Revert "TIVI-227: Add nsswitch.conf to fix localhost resolution issue"

This reverts commit 70ecd0b7ee6067c326b1f85f4b5dd023ba474ede.

diff --git a/etc/inittab b/etc/inittab
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/etc/mtools.conf b/etc/mtools.conf
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/etc/nsswitch.conf b/etc/nsswitch.conf
deleted file mode 100644 (file)
index 4d2a763..0000000
--- a/etc/nsswitch.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# /etc/nsswitch.conf
-#
-# Example configuration of GNU Name Service Switch functionality.
-#
-
-passwd:                db files
-group:         db files
-shadow:                db files
-gshadow:       files
-
-hosts:         files dns
-networks:      files dns
-
-protocols:     db files
-services:      db files
-ethers:                db files
-rpc:           db files
-
-netgroup:      db files

diff --git a/packaging/system-plugin-ia-generic.changes b/packaging/system-plugin-ia-generic.changes
index c6d073a..2334ac7 100644 (file)
--- a/packaging/system-plugin-ia-generic.changes
+++ b/packaging/system-plugin-ia-generic.changes
@@ -1,6 +1,10 @@
-* Thu Nov 15 19:41:07 UTC 2012 - tracy.graydon@intel.com
-- TIVI-227: Add nsswitch.conf file to fix localhost resolution issue 
-- Fixed some file permisisons on etc/*.conf files
+* Thu Nov 7 2012 Rusty Lynch <rusty.lynch@intel.com> submit/2.0alpha-wayland/20121108.022441@7e05691
+- Fix menu-screen auto startup.
+- Fix packaging to be consistent with Tizen guidelines
+
+* Sat Nov  3 01:14:36 UTC 2012 - tracy.graydon@intel.com
+- Fix a couple of issues in rc.firstboot causing funky errors on start up.
+- Add rc.emul and rc.network explicitly to spec 
 
 * Thu Aug 09 2012 Arron <arron.wang@intel.com>
 - Add Tizen wifi port script, due to we don't need load/unload wifi

diff --git a/packaging/system-plugin-ia-generic.spec b/packaging/system-plugin-ia-generic.spec
index 43c401c..74b4702 100644 (file)
--- a/packaging/system-plugin-ia-generic.spec
+++ b/packaging/system-plugin-ia-generic.spec
@@ -6,8 +6,6 @@ Group: System/Base
 Release: 1
 Source: %{name}-%{version}.tar.bz2
 Source1001: packaging/system-plugin-ia-generic.manifest 
-# >> gbp-patch-tags         # auto-added by gbp
-# << gbp-patch-tags         # auto-added by gbp
 Requires: udev
 ExclusiveArch: %ix86 x86_64
 
@@ -17,8 +15,6 @@ Startup files
 
 %prep
 %setup -q
-# >> gbp-apply-patches    # auto-added by gbp
-# << gbp-apply-patches    # auto-added by gbp
 
 %build
 cp %{SOURCE1001} .
@@ -28,14 +24,11 @@ cp -a etc %{buildroot}
 cp -a usr %{buildroot}
 
 
-
-
 %files
 %manifest system-plugin-ia-generic.manifest
 /etc/fstab
 %config(noreplace) /etc/inittab
 %exclude %config(noreplace) /etc/mtools.conf
-/etc/nsswitch.conf
 /etc/profile.d/system.sh
 /etc/profile.d/fonts.sh
 /etc/rc.d/rc.entersleep
@@ -43,5 +36,6 @@ cp -a usr %{buildroot}
 /etc/rc.d/rc.leavesleep
 /etc/rc.d/rc.shutdown
 /etc/rc.d/rc.sysinit
-/etc/rc.d/rc.*
+/etc/rc.d/rc.emul
+/etc/rc.d/rc.network
 /usr/bin/wlan.sh