Disable Askuser temporary from the time of image creation.

Change-Id: Iadb2357e48f32777bdf0a577522af11fe26be6ec

diff --git a/packaging/security-config.spec b/packaging/security-config.spec
index 11093117c0838aea5cd9fc380b792727e305c6c9..81208314ee3494a2a478d2c0a6e98269322b8ecd 100755 (executable)
--- a/packaging/security-config.spec
+++ b/packaging/security-config.spec
@@ -55,6 +55,8 @@ ln -s ../%{name}.service %{buildroot}/%{_unitdir}/multi-user.target.wants/%{name
 /usr/share/security-config/set_label
 mkdir -p /opt/share/security-config/result
 mkdir -p /opt/share/security-config/log
+# This is added to disable askuser temporary, untin askuser-4.0 is implemented.
+touch /opt/share/askuser_disable
 
 %post profile_mobile
 mv /opt/share/security-config/test/root_test/mobile/* /opt/share/security-config/test/root_test/

diff --git a/smack/smack_default_labeling b/smack/smack_default_labeling
index cfcadf0e13702ada1475b1587e85df335241d79b..20b40faca81a2179641fd217e560d02a2cc6e2e8 100644 (file)
--- a/smack/smack_default_labeling
+++ b/smack/smack_default_labeling
@@ -9,7 +9,6 @@ function check_init_boot
        if [ ! -e /opt/share/security-config/.smack_pre_labeling ]
        then
                touch /opt/share/security-config/.smack_pre_labeling
-               touch /opt/share/askuser_disable # TODO : This must be removed after askuser-4.0 is fully implemented.
                return 1
        fi
        return 0