mirror of
https://github.com/roddhjav/apparmor.d.git
synced 2024-11-14 23:43:56 +01:00
Remove flavor configuration.
This commit is contained in:
parent
f3a982fdf6
commit
18f56603b3
2
PKGBUILD
2
PKGBUILD
@ -18,7 +18,7 @@ prepare() {
|
||||
git clone "$startdir" "$srcdir/$pkgname"
|
||||
cd "$srcdir/$pkgname"
|
||||
|
||||
./configure --distribution=archlinux --flavor=desktop
|
||||
./configure --distribution=archlinux
|
||||
}
|
||||
|
||||
package() {
|
||||
|
17
configure
vendored
17
configure
vendored
@ -45,19 +45,6 @@ configure() {
|
||||
|
||||
fi
|
||||
|
||||
echo "Set the configuration for a $FLAVOR."
|
||||
if [[ "$FLAVOR" == server ]]; then
|
||||
REMOVE_LIST+=(
|
||||
apparmor.d/groups/apps
|
||||
apparmor.d/groups/browsers
|
||||
apparmor.d/groups/desktop
|
||||
apparmor.d/groups/gnome
|
||||
apparmor.d/groups/gvfs
|
||||
apparmor.d/groups/network/NetworkManager
|
||||
apparmor.d/groups/network/nm-*
|
||||
)
|
||||
|
||||
fi
|
||||
}
|
||||
|
||||
# Initialise the apparmor.d with the selected configuration.
|
||||
@ -110,19 +97,17 @@ cmd_help() {
|
||||
|
||||
Options:
|
||||
--distribution=DIST Set the target Linux distribution (Archlinux, Debian)
|
||||
--flavor=FLAVOR Special flavor specific configuration (desktop, server)
|
||||
--help Print this help message and exit.
|
||||
_EOF
|
||||
}
|
||||
|
||||
main() {
|
||||
local opts err
|
||||
opts="$(getopt -o h -l distribution:,flavor:,groups:,help -n "$PROGRAM" -- "$@")"
|
||||
opts="$(getopt -o h -l distribution:,help -n "$PROGRAM" -- "$@")"
|
||||
err=$?
|
||||
eval set -- "$opts"
|
||||
while true; do case $1 in
|
||||
--distribution) DISTRIBUTION="$2"; shift 2 ;;
|
||||
--flavor) FLAVOR="$2"; shift 2 ;;
|
||||
-h|--help) shift; cmd_help; exit 0 ;;
|
||||
--) shift; break ;;
|
||||
esac done
|
||||
|
2
debian/rules
vendored
2
debian/rules
vendored
@ -9,7 +9,7 @@
|
||||
dh $@ --with=config-package
|
||||
|
||||
override_dh_auto_configure:
|
||||
./configure --distribution=debian --flavor=desktop
|
||||
./configure --distribution=debian
|
||||
|
||||
override_dh_install:
|
||||
find systemd/ -type f -exec \
|
||||
|
Loading…
Reference in New Issue
Block a user