|
|
|
@ -1015,17 +1015,19 @@ function main_pkg_list() { |
|
|
|
if [ -f $SCRIPT_DIR/pkglists/ubuntu-main.list ]; then |
|
|
|
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ |
|
|
|
$APT_CMD install $APT_OPTIONS \ |
|
|
|
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-main.list | tr "\n" " ") >>$OUTPUT 2>&1 |
|
|
|
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-main.list | tr "\n" " ") >>$OUTPUT 2>&1 |
|
|
|
fi |
|
|
|
if [ -f $SCRIPT_DIR/pkglists/ubuntu-gui.list ]; then |
|
|
|
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ |
|
|
|
$APT_CMD install $APT_OPTIONS tasksel >>$OUTPUT 2>&1 && |
|
|
|
tasksel install xubuntu-core >>$OUTPUT 2>&1 && |
|
|
|
$APT_CMD install $APT_OPTIONS \ |
|
|
|
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-gui.list | tr "\n" " ") >>$OUTPUT 2>&1 |
|
|
|
fi |
|
|
|
if [ -f $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list ]; then |
|
|
|
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ |
|
|
|
$APT_CMD install $APT_OPTIONS \ |
|
|
|
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") >>$OUTPUT 2>&1 |
|
|
|
$APT_CMD install $APT_OPTIONS --no-install-recommends \ |
|
|
|
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") >>$OUTPUT 2>&1 |
|
|
|
fi |
|
|
|
fi |
|
|
|
elif [ $DEBIAN_FRONTEND_TYPE = "dialog" ]; then |
|
|
|
@ -1039,16 +1041,18 @@ function main_pkg_list() { |
|
|
|
fi |
|
|
|
if [ $LIVE_TYPE = "ubuntu" ]; then |
|
|
|
if [ -f $SCRIPT_DIR/pkglists/ubuntu-main.list ]; then |
|
|
|
$APT_CMD install $APT_OPTIONS \ |
|
|
|
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-main.list | tr "\n" " ") |
|
|
|
$APT_CMD install $APT_OPTIONS \ |
|
|
|
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-main.list | tr "\n" " ") |
|
|
|
fi |
|
|
|
if [ -f $SCRIPT_DIR/pkglists/ubuntu-gui.list ]; then |
|
|
|
$APT_CMD install $APT_OPTIONS tasksel && |
|
|
|
tasksel install xubuntu-core && |
|
|
|
$APT_CMD install $APT_OPTIONS \ |
|
|
|
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-gui.list | tr "\n" " ") |
|
|
|
fi |
|
|
|
if [ -f $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list ]; then |
|
|
|
$APT_CMD install $APT_OPTIONS \ |
|
|
|
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") |
|
|
|
$APT_CMD install $APT_OPTIONS --no-install-recommends \ |
|
|
|
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
@ -1149,6 +1153,18 @@ EOF |
|
|
|
echo "resolvconf resolvconf/linkify-resolvconf boolean true" | debconf-set-selections |
|
|
|
dpkg-reconfigure resolvconf >>$OUTPUT 2>&1 |
|
|
|
fi |
|
|
|
if [ $LIVE_TYPE = "ubuntu" ]; then |
|
|
|
# network manager |
|
|
|
cat <<EOF >/etc/NetworkManager/NetworkManager.conf |
|
|
|
[main] |
|
|
|
rc-manager=resolvconf |
|
|
|
plugins=ifupdown,keyfile |
|
|
|
dns=dnsmasq |
|
|
|
[ifupdown] |
|
|
|
managed=false |
|
|
|
EOF |
|
|
|
dpkg-reconfigure network-manager >>$OUTPUT 2>&1 |
|
|
|
fi |
|
|
|
elif [ $DEBIAN_FRONTEND_TYPE = "dialog" ]; then |
|
|
|
|
|
|
|
dpkg-reconfigure console-setup |
|
|
|
@ -1163,9 +1179,9 @@ EOF |
|
|
|
if grep resolvconf $SCRIPT_DIR/pkglists/main.list >>$OUTPUT 2>&1 || grep resolvconf $SCRIPT_DIR/pkglists/other.list || [ $DISTRIBUTION != "xenial" ] >>$OUTPUT 2>&1; then |
|
|
|
dpkg-reconfigure resolvconf |
|
|
|
fi |
|
|
|
|
|
|
|
# network manager |
|
|
|
cat <<EOF >/etc/NetworkManager/NetworkManager.conf |
|
|
|
if [ $LIVE_TYPE = "ubuntu" ]; then |
|
|
|
# network manager |
|
|
|
cat <<EOF >/etc/NetworkManager/NetworkManager.conf |
|
|
|
[main] |
|
|
|
rc-manager=resolvconf |
|
|
|
plugins=ifupdown,keyfile |
|
|
|
@ -1173,8 +1189,8 @@ dns=dnsmasq |
|
|
|
[ifupdown] |
|
|
|
managed=false |
|
|
|
EOF |
|
|
|
dpkg-reconfigure network-manager |
|
|
|
|
|
|
|
dpkg-reconfigure network-manager |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
# remove unused |
|
|
|
@ -1235,12 +1251,18 @@ EOF |
|
|
|
#rm /etc/alternatives/default.plymouth |
|
|
|
#rm /etc/alternatives/text.plymouth |
|
|
|
update-alternatives --install /usr/share/plymouth/themes/default.plymouth default.plymouth /usr/share/plymouth/themes/minios-logo/minios-logo.plymouth 200 |
|
|
|
update-alternatives --install /usr/share/plymouth/themes/text.plymouth text.plymouth /usr/share/plymouth/themes/minios-text/minios-text.plymouth 200 |
|
|
|
update-alternatives --config default.plymouth --skip-auto |
|
|
|
#ln -s /usr/share/plymouth/themes/minios-logo/minios-logo.plymouth /etc/alternatives/default.plymouth |
|
|
|
#ln -s /usr/share/plymouth/themes/minios-logo/minios-text.plymouth /etc/alternatives/text.plymouth |
|
|
|
update-initramfs -u |
|
|
|
rm /usr/share/xfce4/backdrops/xubuntu-wallpaper.png |
|
|
|
ln -s /usr/share/backgrounds/MiniOS.png /usr/share/xfce4/backdrops/xubuntu-wallpaper.png |
|
|
|
if [ -f /usr/share/xfce4/backdrops/xubuntu-wallpaper.png ]; then |
|
|
|
rm /usr/share/xfce4/backdrops/xubuntu-wallpaper.png |
|
|
|
fi |
|
|
|
if [ ! -d /usr/share/xfce4/backdrops ]; then |
|
|
|
mkdir -p /usr/share/xfce4/backdrops |
|
|
|
ln -s /usr/share/backgrounds/MiniOS.png /usr/share/xfce4/backdrops/xubuntu-wallpaper.png |
|
|
|
fi |
|
|
|
|
|
|
|
: 'echo "Set up user 'ubuntu'" >>$OUTPUT 2>&1 |
|
|
|
adduser --gecos '' ubuntu --disabled-password >>$OUTPUT 2>&1 |
|
|
|
|
