Subversion Repositories ALCASAR

Compare Revisions

No changes between revisions

Ignore whitespace Rev 2431 → Rev 2432

/alcasar.sh
393,6 → 393,9
grep -v '[eE]nter password:' | \
sed -e "s/PBKDF2 hash of your password is //"`
echo "GRUB2_PASSWORD=$pbkdf2" > /boot/grub2/user.cfg
[ -e /etc/grub.d/default-10_linux ] || cp /etc/grub.d/10_linux /etc/grub.d/default-10_linux
cp -f $DIR_CONF/grub-10_linux /etc/grub.d/10_linux # Request password only on menu editing attempts (not when selecting an entry)
/usr/bin/update-grub2
chmod 0600 /boot/grub2/user.cfg
echo "# Login name and password to protect GRUB2 boot menu (!!!qwerty keyboard) : " > $PASSWD_FILE
echo "GRUB2_user=root" >> $PASSWD_FILE
2183,30 → 2186,26
echo "net.ipv6.conf.default.autoconf = 0" >> /etc/sysctl.d/alcasar.conf
# switch to multi-users runlevel (instead of x11)
ln -sf /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
# GRUB modifications (only one time)
# Limit wait time to 3s - Create an alcasar entry instead of linux-nonfb - Change the default banner
# vm_vga=`lsmod | egrep -c "virtio|vmwgfx"` # test if in VM
# grub_already_modified=`grep -c ALCASAR /boot/grub/menu.lst`
# [ -e /etc/mageia-release.default ] || cp /etc/mageia-release /etc/mageia-release.default
# if [ $grub_already_modified == 0 ]
# then
# $SED "s?^timeout.*?timeout 3?g" /boot/grub/menu.lst
# $SED "s?^title linux?title ALCASAR?g" /boot/grub/menu.lst
# $SED "/^kernel/s/splash quiet //" /boot/grub/menu.lst
# $SED "/^kernel/s/BOOT_IMAGE=linux /BOOT_IMAGE=linux-nonfb /" /boot/grub/menu.lst
# $SED "/^gfxmenu/d" /boot/grub/menu.lst
# if [ $vm_vga == 0 ] # is not a VM
# then
# $SED "/BOOT_IMAGE=linux-nonfb/s/$/ vga=791/" /boot/grub/menu.lst # change display to 1024*768 (vga791) only if not on VM and only on ALCASAR entry
# fi
# fi
# if [ $vm_vga == 0 ] # is not a VM
# then
cp -f $DIR_CONF/banner /etc/mageia-release
echo " V$VERSION" >> /etc/mageia-release
# else
# echo "ALCASAR V$VERSION" > /etc/mageia-release
# fi
# GRUB2 modifications (Wait time : 3s - ALCASAR entry - VGA=791 - Change the default banner
[ -e /etc/default/grub.default ] || cp /etc/default/grub /etc/default/grub.default
$SED "s?^GRUB_TIMEOUT=.*?GRUB_TIMEOUT=3?g" /etc/default/grub
$SED "s?^GRUB_DISTRIBUTOR=.*?GRUB_DISTRIBUTOR=ALCASAR (on Mageia)?g" /etc/default/grub/
[ -e /etc/mageia-release.default ] || cp /etc/mageia-release /etc/mageia-release.default
vm_vga=`lsmod | egrep -c "virtio|vmwgfx"` # test if in VM
if [ $vm_vga == 0 ] # is not a VM
then
cp -f $DIR_CONF/banner /etc/mageia-release # ALCASAR ASCII-Art
echo >> /etc/mageia-release
$SED "s?ĜRUB_CMDLINE_LINUX_DEFAULT=\"?&vga=791 ?" /etc/default/grub
fi
if [ $Lang == "fr" ]
then
echo "Bienvenue sur ALCASAR V$VERSION" >> /etc/mageia-release
echo "Connectez-vous à l'URL 'http://alcasar.localdomain/acc'" >> /etc/mageia-release
else
echo "Welcome on ALCASAR V$VERSION" >> /etc/mageia-release
echo "Connect to 'http://alcasar.localdomain/acc'" >> /etc/mageia-release
fi
# Load and apply the previous conf file
if [ "$mode" = "update" ]
then
/blacklist/blacklist-MD5SUM.lst
1,78 → 1,78
b225da3c7774b42792b4c9b893577f41 ads.tar.gz
fb2e5379e8d037c351ee2cc4ac18ee4f adult.tar.gz
7b5c1f7081647e05fc458d8fd8c7d83b aggressive.tar.gz
7b5c1f7081647e05fc458d8fd8c7d83b agressif.tar.gz
595dcc31c2c6e0a8181dacc2e4cc9f1d arjel.tar.gz
2e39a38eea6e19c42030f0c66de0d95f associations_religieuses.tar.gz
99ed81487471cbce0f974bba8cb5b5de astrology.tar.gz
7d46e9ecc9a8ad4bb2c0f67dbc4bead8 audio-video.tar.gz
d24826f8e26aa3ace645823501c8e081 bank.tar.gz
ae09758da47271e54f03c5c081f72d6b bitcoin.tar.gz
7cba98ce59d3715e1d0761cf4b47ace0 blacklists.tar.gz
56de5357d082d339259b4533a2ff52b4 blog.tar.gz
7e65c0397ed12e09534868ddc043bf3e ads.tar.gz
8adce973900d5cb0361396322c182fc7 adult.tar.gz
c0a46b607f4c4a65656e240bacacee61 aggressive.tar.gz
c0a46b607f4c4a65656e240bacacee61 agressif.tar.gz
8ece3d682ec10c6062f2fa7d76df69d7 arjel.tar.gz
a5cf3de99fe5685b54e0e664cdf831e2 associations_religieuses.tar.gz
7e63180e569d33873f226cf399069336 astrology.tar.gz
c369e11ea2b7185028bab2baece7508c audio-video.tar.gz
4b8b9e1cb178c2f3732dabda7e2363c6 bank.tar.gz
e2938934b66a5ff679b62190ce611364 bitcoin.tar.gz
80f94c3808bce1aea1fa5837b702cf04 blacklists.tar.gz
41733d220e666e825722579f7373c6f1 blog.tar.gz
ef28e523a6126720e0e7b4eafa0438e9 catalogue-biu-toulouse.tar.gz
df9a1b3eb930697f684e0aae9ee09a58 cc-by-sa-4-0.pdf
4753173b4ee1b638971604750ee51275 cc-by-sa-4-0.pdf.tar.gz
0735b00f0b3adc7be89962609421c98f celebrity.tar.gz
4e3f2c5583398976b48ee09aa37939b3 chat.tar.gz
9b32193d421282e4225e79a77f67a196 child.tar.gz
09b4d962cc7029a6f5ffb2bdccad79bb cleaning.tar.gz
e62c79d6c81e7378bafb42ad19ac58fd cooking.tar.gz
acd995f2d2027d7ff69f450926334b12 dangerous_material.tar.gz
c9fef5b1428d71a780656f1f4e43c03f dating.tar.gz
0fd5ef75f7f1e6f9a330abef3ce62edc ddos.tar.gz
c6452087cde339a43eddb89bc2f37af3 dialer.tar.gz
e6a6f460d094d405b6f3722a5b080d2c celebrity.tar.gz
0935c668d72e9dcf11dd91ad4ef4ba6e chat.tar.gz
66195770494090b9258a6de8ebb7f44e child.tar.gz
3562ece02443435710618292eb6059e5 cleaning.tar.gz
2f03bca7af65f223f554665deac4ba76 cooking.tar.gz
420f466ef0f4f247b2c8b4099387398d dangerous_material.tar.gz
35f8c2d246acab4458cbf8bf1c544f66 dating.tar.gz
b5700d5925f367b4b5ecde09647fd3e5 ddos.tar.gz
5be7ea7e8807f046c733dc64e9880f6b dialer.tar.gz
258ff924b2fc72d0d00b0fb9b07de5e1 domains.tar.gz
020f7d407ff89ca01ef7e570be8f98d0 download.tar.gz
e140f566accddc00515b01bf72884a17 drogue.tar.gz
e140f566accddc00515b01bf72884a17 drugs.tar.gz
97377065bb230501014f43cf0a2b5ce4 educational_games.tar.gz
052faa7c905ca10500fd08bc42676dc5 filehosting.tar.gz
f2414cb31dba7249d662ddd219592525 financial.tar.gz
f81bbb0a878de279cd2b27f686cf7db2 forums.tar.gz
904d7cea5062ece58c57511a7af53d50 gambling.tar.gz
987ca5bd8f5ceb28049931477a465ede games.tar.gz
fcd677559bfe4b18c1d9bd42c362bd47 download.tar.gz
a80e3e2f3e68902dfed65a9e63ae5503 drogue.tar.gz
a80e3e2f3e68902dfed65a9e63ae5503 drugs.tar.gz
9143e00cc564b37fcbe38694f646c46f educational_games.tar.gz
dd81ac8b035ad138df2939f8c7d9a970 filehosting.tar.gz
11fb018ebd92b9eae6474426245bcd00 financial.tar.gz
36857bdc7c9fae22b603e6155323dbd9 forums.tar.gz
76f44fcf2b96d8446f85fb6890a0b893 gambling.tar.gz
c3f412c2f4215fa5cef85dc4151f02b0 games.tar.gz
693d7305264ac20833ca572305da678d global_usage
467047e030cd25ada0ff07e7efde319b good.tar.gz
e8b0e3e2e27ec7a0eb53971f4891e284 hacking.tar.gz
6ee0e710c472df832b1107e56bf34338 hacking.tar.gz
f8bca2fb264f98dee6568be26c2b6bb0 indisponible.tar.gz
17a432dace0c6061863e71509d348fa0 jobsearch.tar.gz
3420827d7d325ec9b643b928fdb5efc2 jobsearch.tar.gz
ac1964f0919cb2a7a1627ed9734358fd jstor.tar.gz
df9a1b3eb930697f684e0aae9ee09a58 LICENSE.pdf
4753173b4ee1b638971604750ee51275 LICENSE.pdf.tar.gz
14f0dfe9ca7d111c8014147e33976078 lingerie.tar.gz
ff90d19d110b6a2e6e076ce7fddc5bbc liste_blanche.tar.gz
2847be2c78da5a06a2dff6a04275eb55 liste_bu.tar.gz
33112e75227cf9cc288e0abccd2616b3 lingerie.tar.gz
bb7b430d1c059e1f0fec89fe99e1e3b1 liste_blanche.tar.gz
e7005a8dadaf289af644ee4319f33ecc liste_bu.tar.gz
15feac414f0b5351e806182ff0baf0cf local.tar.gz
4a89bcb20221644fc48eeffa48b69bab malware.tar.gz
3919cb57be03230a17a233f0c7f9f066 manga.tar.gz
947ed727907175fce9736e871ec6630e marketingware.tar.gz
f8473d8fe98c836c4076e50c641de960 mixed_adult.tar.gz
67d00c5eb960b8bb65626811d2e0862c mobile-phone.tar.gz
f6e5d4abfc45a672852d8c65a4c2de85 phishing.tar.gz
fb2e5379e8d037c351ee2cc4ac18ee4f porn.tar.gz
517b64a8e4d3832a68e7327d461155ee press.tar.gz
96401afb7087bd1a306b1dcff489fe8f proxy.tar.gz
b225da3c7774b42792b4c9b893577f41 publicite.tar.gz
f5b6c65a57306ba8ef0aced79ef9e4f5 radio.tar.gz
275d2ebc59974a9051fb370993b296de README
a5f8226d7bd68dffab5f68dd576200b0 malware.tar.gz
a762c8a3da1fb2819ecc70f48524a479 manga.tar.gz
d884d37975d83e24d1e6a7c3349ac857 marketingware.tar.gz
281a4dae063c7c86a43ab41dda16675c mixed_adult.tar.gz
32297b936a220c315b85c38bbf0d107a mobile-phone.tar.gz
c0b2c36f2b229a222e2d380168bf993a phishing.tar.gz
8adce973900d5cb0361396322c182fc7 porn.tar.gz
15f3c4b93c67478b352eac7ca397d65d press.tar.gz
6de11e0e5ebb08194ca6abe1b76f5a57 proxy.tar.gz
7e65c0397ed12e09534868ddc043bf3e publicite.tar.gz
ea5b7102963b0fbe135094b1f25eb73f radio.tar.gz
de8b1c54b724f5ef7017e1ccc2c5c1df README
644078c9061fe7413d4f42ab9259bacc README.tar.gz
be0c5d34f3655b590ba6d22dce622c2f reaffected.tar.gz
96401afb7087bd1a306b1dcff489fe8f redirector.tar.gz
cb6c19b68b31edd551362b981a2db884 remote-control.tar.gz
c29381543930e1513b5d0edbc1ed0023 sect.tar.gz
28e0a69310d24db4aff36bf9bacc5a5f sexual_education.tar.gz
6c34b1b987a4a30a64d0f48f3eb139c0 shopping.tar.gz
557064f045d7dede24de50a6a77b0705 shortener.tar.gz
79e2e6a4ab5b568cd7fa4a99bf57ca7d social_networks.tar.gz
60000c8e48c00355fc1f6c681f0aaad1 special.tar.gz
b93f5f9ff8c94cbc59eb471719a5dde4 sports.tar.gz
b856411b46334ee23cda7a0e823844ce strict_redirector.tar.gz
e16b1a9c55c963cfc1d5b593e956079b strong_redirector.tar.gz
ac4756679a40a47a2ac5e5f410765541 translation.tar.gz
1a3223d07970b35734a3eff7b8f37158 tricheur.tar.gz
e10d17189fb3c8c6f66a16fa23e587a4 update.tar.gz
10f191d83b72727db1b834ed6d45b6e7 reaffected.tar.gz
6de11e0e5ebb08194ca6abe1b76f5a57 redirector.tar.gz
0ecd9cbb51e001f967a26430229ef5a9 remote-control.tar.gz
d90109c1e8055f85d228b421d103d115 sect.tar.gz
834bc948886315a0dea6f208ccf31a4f sexual_education.tar.gz
9281a22511f8665f3254c3b888b66c15 shopping.tar.gz
9ec1d5a49ec552149d1b65b072a96ef8 shortener.tar.gz
5791034dc85f3d9095642fbb1900247c social_networks.tar.gz
a7455b58e9c9b989920d4f5a568bbbfa special.tar.gz
11763b3ca3da459a6161b3f48f8be25e sports.tar.gz
87ceadfc974773cd8057b6d44d1eed64 strict_redirector.tar.gz
e6edea48ece5c5d65dfdbe1d2f651fac strong_redirector.tar.gz
2b66d4f4522fc3ad0246e47ec5af5da4 translation.tar.gz
cde3f9e482b4c0a8d78544096f5a471c tricheur.tar.gz
1d7635edb16b2806434678a61c3a0351 update.tar.gz
fbeadab243f379efaa4c0fea89caa60b verisign.tar.gz
7b5c1f7081647e05fc458d8fd8c7d83b violence.tar.gz
2282722251ec535f701c7366a467fb57 warez.tar.gz
ee7199baa1ce4d3ea1b5251186781cb2 webmail.tar.gz
c0a46b607f4c4a65656e240bacacee61 violence.tar.gz
6dade9053c2a9e884be24dee362f685e warez.tar.gz
2e01bcbe310177a5eff34d2e9b652244 webmail.tar.gz
/blacklist/blacklists.tar.gz
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/conf/grub-10_linux
0,0 → 1,307
#! /bin/sh
set -e
 
# grub-mkconfig helper script.
# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
#
# GRUB is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# GRUB is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
 
prefix="/usr"
exec_prefix="/usr"
datarootdir="/usr/share"
 
. "$pkgdatadir/grub-mkconfig_lib"
 
export TEXTDOMAIN=grub
export TEXTDOMAINDIR="${datarootdir}/locale"
 
if [ -e /boot/grub2/user.cfg ] && grep -q GRUB2_PASSWORD /boot/grub2/user.cfg; then
CLASS="--class gnu-linux --class gnu --class os --unrestricted"
fi
 
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS="$(eval $(grep PRETTY_NAME /etc/os-release) ; echo ${PRETTY_NAME})"
CLASS="--class $(eval $(grep '^ID_LIKE=\|^ID=' /etc/os-release) ; [ -n "${ID_LIKE}" ] && echo ${ID_LIKE} || echo ${ID}) ${CLASS}"
else
OS="${GRUB_DISTRIBUTOR}"
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
fi
 
# loop-AES arranges things so that /dev/loop/X can be our root device, but
# the initrds that Linux uses don't like that.
case ${GRUB_DEVICE} in
/dev/loop/*|/dev/loop[0-9])
GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
;;
esac
 
# btrfs may reside on multiple devices. We cannot pass them as value of root= parameter
# and mounting btrfs requires user space scanning, so force UUID in this case.
if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
|| ( ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" && [ "x${DURING_INSTALL}" != "x1" ] ) \
|| ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
else
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
fi
 
case x"$GRUB_FS" in
xbtrfs)
rootsubvol="`make_system_path_relative_to_its_root /`"
rootsubvol="${rootsubvol#/}"
if [ "x${rootsubvol}" != x ]; then
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
fi;;
xzfs)
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
;;
esac
 
mktitle ()
{
local OS_NAME="$(eval $(grep ^NAME= /etc/os-release) ; echo ${NAME})"
local OS_VERS="$(eval $(grep ^VERSION= /etc/os-release) ; echo ${VERSION})"
 
local titlestr="${OS_NAME} (%s) ${OS_VERS}"
echo -n ${titlestr}
}
 
title_correction_code=
 
linux_entry ()
{
os="$1"
version="$2"
type="$3"
args="$4"
 
sixteenbit=""
linuxefi="linux"
initrdefi="initrd"
case "$machine" in
i?86|x86_64)
sixteenbit="16"
linuxefi="linuxefi"
initrdefi="initrdefi"
;;
aarch64)
linuxefi="linux"
initrdefi="initrd"
;;
esac
 
if [ -z "$boot_device_id" ]; then
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
fi
if [ x$type != xsimple ] ; then
case $type in
recovery)
title="$(printf "$(mktitle) (recovery mode)" "${version}")" ;;
*)
title="$(printf "$(mktitle)" "${version}")" ;;
esac
if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
fi
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
else
echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
fi
if [ x$type != xrecovery ] ; then
save_default_entry | grub_add_tab
fi
 
# Use ELILO's generic "efifb" when it's known to be available.
# FIXME: We need an interface to select vesafb in case efifb can't be used.
if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
echo " load_video" | sed "s/^/$submenu_indentation/"
if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
&& grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
fi
else
if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
echo " load_video" | sed "s/^/$submenu_indentation/"
fi
echo " set gfxpayload=$GRUB_GFXPAYLOAD_LINUX" | sed "s/^/$submenu_indentation/"
fi
 
echo " insmod gzio" | sed "s/^/$submenu_indentation/"
 
if [ x$dirname = x/ ]; then
if [ -z "${prepare_root_cache}" ]; then
prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | grub_add_tab)"
fi
printf '%s\n' "${prepare_root_cache}" | sed "s/^/$submenu_indentation/"
else
if [ -z "${prepare_boot_cache}" ]; then
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
fi
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
fi
if [ -d /sys/firmware/efi ]; then
sed "s/^/$submenu_indentation/" << EOF
${linuxefi} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
EOF
else
sed "s/^/$submenu_indentation/" << EOF
linux${sixteenbit} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
EOF
fi
if test -n "${initrd}" ; then
if [ -d /sys/firmware/efi ]; then
sed "s/^/$submenu_indentation/" << EOF
${initrdefi} ${rel_dirname}/${initrd}
EOF
else
sed "s/^/$submenu_indentation/" << EOF
initrd${sixteenbit} ${rel_dirname}/${initrd}
EOF
fi
fi
if test -n "${fdt}" ; then
sed "s/^/$submenu_indentation/" << EOF
devicetree ${rel_dirname}/${fdt}
EOF
fi
sed "s/^/$submenu_indentation/" << EOF
}
EOF
}
 
machine=`uname -m`
case "x$machine" in
xi?86 | xx86_64)
list=
for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
done ;;
*)
list=
for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
done ;;
esac
 
case "$machine" in
i?86) GENKERNEL_ARCH="x86" ;;
mips|mips64) GENKERNEL_ARCH="mips" ;;
mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
arm*) GENKERNEL_ARCH="arm" ;;
*) GENKERNEL_ARCH="$machine" ;;
esac
 
prepare_boot_cache=
prepare_root_cache=
boot_device_id=
title_correction_code=
 
# Extra indentation to add to menu entries in a submenu. We're not in a submenu
# yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
submenu_indentation=""
 
is_top_level=true
while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list`
gettext_printf "Found linux image: %s\n" "$linux" >&2
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
alt_version=`echo $version | sed -e "s,\.old$,,g"`
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
 
initrd=
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
"initrd-${version}" "initramfs-${version}.img" \
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
"initramfs-genkernel-${version}" \
"initramfs-genkernel-${alt_version}" \
"initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
"initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
if test -e "${dirname}/${i}" ; then
initrd="$i"
break
fi
done
 
fdt=
for i in "dtb-${version}" "dtb-${alt_version}"; do
if test -f "${dirname}/${i}/${GRUB_DEFAULT_DTB}" ; then
fdt="${i}/${GRUB_DEFAULT_DTB}"
break
fi
done
 
config=
for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
if test -e "${i}" ; then
config="${i}"
break
fi
done
 
initramfs=
if test -n "${config}" ; then
initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"`
fi
 
if test -n "${initrd}" ; then
gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
elif test -z "${initramfs}" ; then
# "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's
# no initrd or builtin initramfs, it can't work here.
linux_root_device_thisversion=${GRUB_DEVICE}
fi
 
if [ "x${GRUB_DISABLE_SUBMENU}" = "xyes" ] || [ "x${GRUB_DISABLE_SUBMENU}" = "xy" ]; then
GRUB_DISABLE_SUBMENU="true"
fi
 
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
linux_entry "${OS}" "${version}" simple \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
 
submenu_indentation="$grub_tab"
if [ -z "$boot_device_id" ]; then
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
fi
# TRANSLATORS: %s is replaced with an OS name
echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
is_top_level=false
fi
 
linux_entry "${OS}" "${version}" advanced \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
linux_entry "${OS}" "${version}" recovery \
"failsafe ${GRUB_CMDLINE_LINUX}"
fi
 
list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
done
 
# If at least one kernel was found, then we need to
# add a closing '}' for the submenu command.
if [ x"$is_top_level" != xtrue ]; then
echo '}'
fi
 
echo "$title_correction_code"
Property changes:
Added: svn:executable
+*
\ No newline at end of property
/scripts/alcasar-conf.sh
108,8 → 108,6
else
cp -f /etc/pki/tls/certs/alcasar.crt $DIR_UPDATE/server-chain.crt
fi
# backup DNSMASQ conf file
cp /etc/sysconfig/dnsmasq $DIR_UPDATE
# archive file creation
cd /tmp
tar -cf alcasar-conf.tar conf/
149,10 → 147,6
export PARENT_SCRIPT
$DIR_BIN/alcasar-bl.sh -cat_choice
$DIR_BIN/alcasar-bl.sh -reload
# retrieve dnsmasq general config file
[ -e $DIR_UPDATE/dnsmasq ] && cp -f $DIR_UPDATE/dnsmasq /etc/sysconfig/dnsmasq \
&& chown root.root /etc/sysconfig/dnsmasq \
&& chmod 644 /etc/sysconfig/dnsmasq
# admin profile update (admin + manager + backup)
$DIR_BIN/alcasar-profil.sh --list
# Start / Stop SSH Daemon
/scripts/alcasar-uninstall.sh
85,10 → 85,16
rm -f /root/ALCASAR* && echo -n "1"
sleep 1
 
echo -en "\n- init (2) : "
[ -e /boot/grub2/user.cfg ] && rm -f /boot/grub2/user.cfg && echo -n "1, "
[ -e /etc/grub.d/default-10_linux ] || mv -f /etc/grub.d/default-10_linux /etc/grub.d/10_linux && echo -n "2"
/usr/bin/update-grub2
sleep 1
 
echo -en "\n- ACC (11) : "
[ -d /var/www/html ] && rm -rf /var/www/html && echo -n "1, "
[ -d /etc/freeradius-web ] && rm -rf /etc/freeradius-webl && echo -n "2, "
[ -e /etc/php.ini.default ] && mv /etc/php.ini.default /etc/php.ini && echo -n "3, "
[ -e /etc/php.ini.default ] && mv -f /etc/php.ini.default /etc/php.ini && echo -n "3, "
[ -e /etc/httpd/conf/httpd.conf.default ] && mv /etc/httpd/conf/httpd.conf.default /etc/httpd/conf/httpd.conf && echo -n "4, "
[ -e /etc/httpd/conf/modules.d/00_base.conf.default ] && mv /etc/httpd/conf/modules.d/00_base.conf.default /etc/httpd/conf/modules.d/00_base.conf && echo -n "5, "
[ -e /etc/httpd/conf/conf.d/ssl.conf.default ] && mv /etc/httpd/conf/conf.d/ssl.conf.default /etc/httpd/conf/conf.d/ssl.conf && echo -n "6, "
214,24 → 220,24
[ -e /etc/fail2ban/fail2ban.conf.default ] && mv /etc/fail2ban/fail2ban.conf.default /etc/fail2ban/fail2ban.conf && echo -n "1, "
[ -e /etc/fail2ban/jail.conf.default ] && mv /etc/fail2ban/jail.conf.default /etc/fail2ban/jail.conf && echo -n "2, "
[ -e /etc/fail2ban/action.d/iptables-allports.conf.default ] && mv /etc/fail2ban/action.d/iptables-allports.conf.default /etc/fail2ban/action.d/iptables-allports.conf && echo -n "3, "
[ -e /etc/fail2ban/filter.d/alcasar_mod-evasive.conf ] && rm /etc/fail2ban/filter.d/alcasar_mod-evasive.conf && echo -n "4, "
[ -e /etc/fail2ban/filter.d/alcasar_acc-htdigest.conf ] && rm /etc/fail2ban/filter.d/alcasar_acc-htdigest.conf && echo -n "5, "
[ -e /etc/fail2ban/filter.d/alcasar_intercept.conf ] && rm /etc/fail2ban/filter.d/alcasar_intercept.conf && echo -n "6, "
[ -e /etc/fail2ban/filter.d/alcasar_change-pwd.conf ] && rm /etc/fail2ban/filter.d/alcasar_change-pwd.conf && echo -n "7, "
i=3
for filter in `ls /etc/fail2ban/filter.d/alcasar_*`
do
i=`expr $i + 1`
rm $filter && echo -n "$i, "
done
[ -e /lib/systemd/system/fail2ban.service.default ] && mv /lib/systemd/system/fail2ban.service.default /lib/systemd/system/fail2ban.service && echo -n "8"
sleep 1
 
echo -en "\n- cron (10) : "
[ -e /etc/crontab.default ] && mv /etc/crontab.default /etc/crontab && echo -n "1, "
[ -e /etc/anacrontab.default ] && mv /etc/anacrontab.default /etc/anacrontab && echo -n "2, "
[ -e /etc/cron.d/alcasar-mysql ] && rm -f /etc/cron.d/alcasar-mysql && echo -n "3, "
[ -e /etc/cron.d/alcasar-archive ] && rm -f /etc/cron.d/alcasar-archive && echo -n "4, "
[ -e /etc/cron.d/alcasar-ticket-clean ] && rm -f /etc/cron.d/alcasar-ticket-clean && echo -n "5, "
[ -e /etc/cron.d/alcasar-distrib-updates ] && rm -f /etc/cron.d/alcasar-distrib-updates && echo -n "6, "
[ -e /etc/cron.d/alcasar-connections-stats ] && rm -f /etc/cron.d/alcasar-connections-stats && echo -n "7, "
[ -e /etc/cron.d/alcasar-watchdog ] && rm -f /etc/cron.d/alcasar-watchdog && echo -n "8, "
[ -e /etc/cron.d/alcasar-daemon-watchdog ] && rm -f /etc/cron.d/alcasar-daemon-watchdog && echo -n "9, "
[ -e /etc/cron.d/alcasar-rsync-bl ] && rm -f /etc/cron.d/alcasar-rsync-bl && echo -n "10,"
echo -en "\n- cron (11) : "
i=0
for cron in `ls /etc/cron.d/alcasar-*`
do
i=`expr $i + 1`
rm $cron && echo -n "$i, "
done
[ -e /etc/crontab.default ] && mv /etc/crontab.default /etc/crontab && echo -n "10, "
[ -e /etc/anacrontab.default ] && mv /etc/anacrontab.default /etc/anacrontab && echo -n "11"
sleep 1
 
echo -en "\n- gammu-smsd (3) : "
268,25 → 274,26
/sbin/ifdown $nic
[ -e /etc/sysconfig/network-scripts/default-ifcfg-$nic ] && mv -f /etc/sysconfig/network-scripts/default-ifcfg-$nic /etc/sysconfig/network-scripts/ifcfg-$nic && echo -n "$i, "
done
[ -e /etc/sysconfig/network.default ] && mv /etc/sysconfig/network.default /etc/sysconfig/network && echo -n "3, "
[ -e /etc/hosts.default ] && mv /etc/hosts.default /etc/hosts && echo -n "4, "
[ -e /etc/hosts.allow.default ] && mv /etc/hosts.allow.default /etc/hosts.allow && echo -n "5, "
[ -e /etc/hosts.deny.default ] && mv /etc/hosts.deny.default /etc/hosts.deny && echo -n "6, "
[ -e /etc/modprobe.preload.default ] && mv /etc/modprobe.preload.default /etc/modprobe.preload && echo -n "7, "
[ -e /lib/systemd/system/iptables.service.default ] && mv /lib/systemd/system/iptables.service.default /lib/systemd/system/iptables.service && echo -n "8, "
[ -e /usr/libexec/iptables.init.default ] && mv /usr/libexec/iptables.init.default /usr/libexec/iptables.init && echo -n "9"
[ -e /etc/sysconfig/network.default ] && mv -f /etc/sysconfig/network.default /etc/sysconfig/network && echo -n "3, "
[ -e /etc/hosts.default ] && mv -f /etc/hosts.default /etc/hosts && echo -n "4, "
[ -e /etc/hosts.allow.default ] && mv -f /etc/hosts.allow.default /etc/hosts.allow && echo -n "5, "
[ -e /etc/hosts.deny.default ] && mv -f /etc/hosts.deny.default /etc/hosts.deny && echo -n "6, "
[ -e /etc/modprobe.preload.default ] && mv -f /etc/modprobe.preload.default /etc/modprobe.preload && echo -n "7, "
[ -e /lib/systemd/system/iptables.service.default ] && mv -f /lib/systemd/system/iptables.service.default /lib/systemd/system/iptables.service && echo -n "8, "
[ -e /usr/libexec/iptables.init.default ] && mv -f /usr/libexec/iptables.init.default /usr/libexec/iptables.init && echo -n "9"
/sbin/ifup $EXTIF
sleep 1
fi
 
#post_install
echo -en "\n- post_install (6) : "
[ -e /etc/mageia-release.default ] && mv /etc/mageia-release.default /etc/mageia-release && echo -n "1, "
echo -en "\n- post_install (7) : "
[ -e /etc/mageia-release.default ] && mv -f /etc/mageia-release.default /etc/mageia-release && echo -n "1, "
[ -e /etc/ssh/alcasar-banner-ssh ] && rm -f /etc/ssh/alcasar-banner-ssh && echo -n "2, "
[ -e /etc/ssh/sshd_config.default ] && mv /etc/ssh/sshd_config.default /etc/ssh/sshd_config && echo -n "3, "
[ -e /etc/bashrc.default ] && mv /etc/bashrc.default /etc/bashrc && echo -n "4, "
[ -e /etc/sudoers.default ] && mv /etc/sudoers.default /etc/sudoers && echo -n "5, "
[ -e /lib/systemd/system/alcasar-load_balancing.service ] && rm -f /lib/systemd/system/alcasar-load_balancing.service && echo -n "6"
[ -e /etc/ssh/sshd_config.default ] && mv -f /etc/ssh/sshd_config.default /etc/ssh/sshd_config && echo -n "3, "
[ -e /etc/bashrc.default ] && mv -f /etc/bashrc.default /etc/bashrc && echo -n "4, "
[ -e /etc/sudoers.default ] && mv -f /etc/sudoers.default /etc/sudoers && echo -n "5, "
[ -e /lib/systemd/system/alcasar-load_balancing.service ] && rm -f /lib/systemd/system/alcasar-load_balancing.service && echo -n "6, "
[ -e /etc/default/grub.default ] && mv -f /etc/default/grub.default /etc/default/grub && echo -n "7"
sleep 1
 
# Cleaning (remove all "old" alcasar scripts)