diff options
author | netblue30 <netblue30@yahoo.com> | 2016-07-19 11:47:44 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-07-19 11:47:44 -0400 |
commit | afe0e236a855b8917c1f4c1bc0273d27dfabda62 (patch) | |
tree | 24bb8982586bcc9ade207f4ca9d6087dfdce4dc7 | |
parent | Merge pull request #638 from Fred-Barclay/gnomerc (diff) | |
download | firejail-afe0e236a855b8917c1f4c1bc0273d27dfabda62.tar.gz firejail-afe0e236a855b8917c1f4c1bc0273d27dfabda62.tar.zst firejail-afe0e236a855b8917c1f4c1bc0273d27dfabda62.zip |
default.profile bug
-rw-r--r-- | src/firejail/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c index 232a57499..703b9913b 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -2072,8 +2072,6 @@ int main(int argc, char **argv) { | |||
2072 | fprintf(stderr, "Warning: default profile disabled by --chroot option\n"); | 2072 | fprintf(stderr, "Warning: default profile disabled by --chroot option\n"); |
2073 | else if (arg_overlay) | 2073 | else if (arg_overlay) |
2074 | fprintf(stderr, "Warning: default profile disabled by --overlay option\n"); | 2074 | fprintf(stderr, "Warning: default profile disabled by --overlay option\n"); |
2075 | // else if (cfg.home_private_keep) | ||
2076 | // fprintf(stderr, "Warning: default profile disabled by --private-home option\n"); | ||
2077 | else { | 2075 | else { |
2078 | // try to load a default profile | 2076 | // try to load a default profile |
2079 | char *profile_name = DEFAULT_USER_PROFILE; | 2077 | char *profile_name = DEFAULT_USER_PROFILE; |
@@ -2096,6 +2094,10 @@ int main(int argc, char **argv) { | |||
2096 | else | 2094 | else |
2097 | custom_profile = profile_find(profile_name, SYSCONFDIR); | 2095 | custom_profile = profile_find(profile_name, SYSCONFDIR); |
2098 | } | 2096 | } |
2097 | if (!custom_profile) { | ||
2098 | fprintf(stderr, "Error: no default.profile installed\n"); | ||
2099 | exit(1); | ||
2100 | } | ||
2099 | 2101 | ||
2100 | if (custom_profile && !arg_quiet) | 2102 | if (custom_profile && !arg_quiet) |
2101 | printf("\n** Note: you can use --noprofile to disable %s.profile **\n\n", profile_name); | 2103 | printf("\n** Note: you can use --noprofile to disable %s.profile **\n\n", profile_name); |