diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-05-25 16:14:15 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-05-25 16:14:15 -0400 |
| commit | 1f83f3a2352f83f2718e6b0a97e1f0737721135a (patch) | |
| tree | 3985dc9154747d99b114bc184e8b50b70b70fc4a | |
| parent | 84cbbf27f735afcd21dbb28052cba9c13172eeaf (diff) | |
| download | kernel-1f83f3a2352f83f2718e6b0a97e1f0737721135a.tar.gz kernel-1f83f3a2352f83f2718e6b0a97e1f0737721135a.tar.xz kernel-1f83f3a2352f83f2718e6b0a97e1f0737721135a.zip | |
Drop CONFIG_USER_NS
Upstream e1c972b681bf118fcedb9fe2ed7a73de983aa5ef makes it depend on
UIDGID_CONVERTED which is only set when all of the subsystems have been
converted to be user namespace safe. That defaults to Y whenever it happens,
so we'll set this after that point.
| -rw-r--r-- | config-generic | 1 | ||||
| -rwxr-xr-x | scripts/sort-config | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/config-generic b/config-generic index beaa3e09b..ca9855af9 100644 --- a/config-generic +++ b/config-generic @@ -52,7 +52,6 @@ CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_DEFAULT_CFQ=y -CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y diff --git a/scripts/sort-config b/scripts/sort-config index 2b9da1ef3..399709f18 100755 --- a/scripts/sort-config +++ b/scripts/sort-config @@ -4,9 +4,9 @@ FC=($(fedpkg verrel | awk -F. '{print $NF}')) SRC=($(ls config-* 2>/dev/null)) -TGT=($(ls kernel-*.$FC/linux-*.noarch/configs/kernel-*-*.config \ - kernel-*.$FC/linux-*.noarch/configs/kernel-*-*-debug.config 2>/dev/null)) -TGT1=(${TGT[*]#kernel-*.$FC/linux-*.noarch/configs/kernel-*-}) +TGT=($(ls kernel-*.$FC/linux-*.$2/configs/kernel-*-*.config \ + kernel-*.$FC/linux-*.$2/configs/kernel-*-*-debug.config 2>/dev/null)) +TGT1=(${TGT[*]#kernel-*.$FC/linux-*.$2/configs/kernel-*-}) ALL_OPTS="cdfimn" @@ -66,11 +66,11 @@ rm -f $TEMPFILES SRCFILE=config-$1 [ ! -f $SRCFILE ] && echo "Input file" $SRCFILE "missing" && exit 2 -TGTFILE=kernel-*.$FC/linux-*.noarch/configs/kernel-*-$2.config +TGTFILE=kernel-*.$FC/linux-*.$2/configs/kernel-*-$2.config [ ! -f $TGTFILE ] && echo "No target file matching" $TGTFILE "exists" && exit 2 [ "$FIND_IMPOSS" ] && \ - find kernel-*.$FC/*.noarch -name Kconfig\* -type f \ + find kernel-*.$FC/*.$2 -name Kconfig\* -type f \ | xargs egrep -s -h '^[[:space:]]*(menu)?config[[:space:]]+' \ | sed -r 's/^[[:space:]]*(menu)?config[[:space:]]+/CONFIG_/' \ | sort | uniq >xx98 |