crims0n
/
minios-live-old
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
crims0n 5 years ago
parent
d5f12b231e
commit
b61f29ddb1
16 changed files with 108 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 0
      build_master
  2. 0
      build_modules
  3. 4
      linux-live/buildconfig
  4. 36
      linux-live/minioslib
  5. 21
      linux-live/modules/02-xubuntu/postinstall
  6. 5
      linux-live/modules/03-apps/package.list
  7. 12
      linux-live/modules/03-apps/postinstall
  8. 4
      linux-live/modules/03-apps/rootcopy/etc/cts/registration_number.json
  9. 1
      linux-live/modules/03-apps/rootcopy/etc/cts/settings-general.json
  10. 1
      linux-live/modules/03-apps/rootcopy/etc/cts/user_registration_info.json
  11. BIN
      linux-live/modules/03-apps/rootcopy/root/cts-4.0.0-104.ks1_amd64.deb
  12. 17
      linux-live/modules/03-apps/rootcopy/usr/share/applications/RDWebAccess.desktop
  13. 17
      linux-live/modules/03-apps/rootcopy/usr/share/applications/RDWebClient.desktop
  14. BIN
      linux-live/modules/03-apps/rootcopy/usr/share/icons/hicolor/apps/microsoft-remote-desktop.png
  15. 4
      linux-live/modules/04-drivers/package.list
  16. 4
      linux-live/pkglists/ubuntu-other.list

0
build_master
View File

0
build_modules
View File

4
linux-live/buildconfig
View File

@ -29,4 +29,6 @@ APT_CMD="apt-get"
APT_OPTIONS="-y" #--no-install-recommends"
#LIVE_TYPE="casper"
LIVE_TYPE="livekit"
LIVE_TYPE="casper"
INSTALL_OPTIONAL="1"

36
linux-live/minioslib
View File

@ -1418,6 +1418,28 @@ EOF
fi
update-initramfs -u
if [ $INSTALL_OPTIONAL = "1" ]; then
if [ -f /linux-live/modules/03-apps/package.list ]; then
$APT_CMD update >>$OUTPUT 2>&1 &&
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" /linux-live/modules/03-apps/package.list | tr "\n" " ") >>$OUTPUT 2>&1
fi
if [ "$(ls -A /linux-live/modules/03-apps/rootcopy)" != "" ]; then
(cd /linux-live/modules/03-apps/rootcopy && cp --parents -afr * /)
fi
if [ -f /linux-live/modules/03-apps/postinstall ]; then
chmod +x /linux-live/modules/03-apps/postinstall
/linux-live/modules/03-apps/postinstall
fi
if [ -f /linux-live/modules/04-drivers/package.list ]; then
$APT_CMD update >>$OUTPUT 2>&1 &&
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" /linux-live/modules/04-drivers/package.list | tr "\n" " ") >>$OUTPUT 2>&1
fi
fi
fi
if [ -f /usr/share/xfce4/backdrops/xubuntu-wallpaper.png ]; then
@ -1671,6 +1693,8 @@ EOF
rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/*InRelease >>$OUTPUT 2>&1
rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/deb.* >>$OUTPUT 2>&1
rm -f $MODULE_UPPER_DIR/var/lib/dpkg/*-old >>$OUTPUT 2>&1
rm -f /preinstall
rm -f /postinstall
}
function build_modules_chroot() {
@ -1706,8 +1730,8 @@ function build_modules_chroot() {
# run pre-install script
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall $MODULE_MERGED_DIR/tmp/preinstall
chmod +x $MODULE_MERGED_DIR/tmp/preinstall
cp $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
chmod +x $MODULE_MERGED_DIR/preinstall
chroot $MODULE_MERGED_DIR /usr/bin/env \
OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \
@ -1718,7 +1742,7 @@ function build_modules_chroot() {
APT_OPTIONS=$APT_OPTIONS \
LIVE_TYPE=$LIVE_TYPE \
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
/tmp/preinstall >>$OUTPUT 2>&1
/preinstall >>$OUTPUT 2>&1
fi
# install packages
@ -1763,8 +1787,8 @@ function build_modules_chroot() {
# run post-install script
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/postinstall ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULE/postinstall $MODULE_MERGED_DIR/tmp/postinstall
chmod +x $MODULE_MERGED_DIR/tmp/postinstall
cp $SCRIPT_DIR/linux-live/modules/$MODULE/postinstall $MODULE_MERGED_DIR/postinstall
chmod +x $MODULE_MERGED_DIR/postinstall
chroot $MODULE_MERGED_DIR /usr/bin/env \
OUTPUT=$OUTPUT \
LOGPATH=$LOGPATH \
@ -1775,7 +1799,7 @@ function build_modules_chroot() {
APT_OPTIONS=$APT_OPTIONS \
LIVE_TYPE=$LIVE_TYPE \
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
/tmp/postinstall >>$OUTPUT 2>&1
/postinstall >>$OUTPUT 2>&1
fi
module_chroot_finish_up

21
linux-live/modules/02-xubuntu/postinstall
View File

@ -9,9 +9,9 @@ autologin-user-timeout=0
EOF
fi
if [ -d /etc/NetworkManager ]; then
echo "Disable dhclient.service autostart." >>$OUTPUT 2>&1
systemctl disable dhclient >>$OUTPUT 2>&1
mkdir -p /etc/netplan >>$OUTPUT 2>&1
echo "Disable dhclient.service autostart."
systemctl disable dhclient
mkdir -p /etc/netplan
cat <<EOF >/etc/netplan/01-netcfg.yaml
# This file describes the network interfaces available on your system
# For more information, see netplan(5).
@ -28,9 +28,14 @@ dns=dnsmasq
[ifupdown]
managed=false
EOF
if [ $DEBIAN_FRONTEND_TYPE = "noninteractive" ]; then
dpkg-reconfigure -f noninteractive network-manager >>$OUTPUT 2>&1
elif [ $DEBIAN_FRONTEND_TYPE = "dialog" ]; then
dpkg-reconfigure network-manager >>$OUTPUT 2>&1
fi
dpkg-reconfigure -f noninteractive network-manager
fi
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
fi
ln -s /usr/share/backgrounds/MiniOS.png /usr/share/xfce4/backdrops/xubuntu-wallpaper.png

5
linux-live/modules/03-apps/package.list
View File

@ -1,3 +1,4 @@
open-vm-tools-desktop
firefox
firefox-locale-ru
#firefox
#firefox-locale-ru
remmina

12
linux-live/modules/03-apps/postinstall
View File

@ -0,0 +1,12 @@
#!/bin/bash
cd /root
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5
echo "deb https://download.onlyoffice.com/repo/debian squeeze main" > /etc/apt/sources.list.d/onlyoffice.list
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
wget -c https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
apt update
apt install -y onlyoffice-desktopeditors
apt install -y /root/google-chrome-stable_current_amd64.deb
apt install -y /root/cts-4.0.0-104.ks1_amd64.deb
rm -f /root/google-chrome-stable_current_amd64.deb
rm -f /root/cts-4.0.0-104.ks1_amd64.deb

4
linux-live/modules/03-apps/rootcopy/etc/cts/registration_number.json
View File

@ -0,0 +1,4 @@
{
"id": " ",
"version": 1
}

1
linux-live/modules/03-apps/rootcopy/etc/cts/settings-general.json
View File

@ -0,0 +1 @@
{"cert_ask_for_adding":true,"cert_check_against_crl":false,"cert_warning_expiration_days":14,"crl_allowed_expiration_days":0,"crl_auto_update":true,"crl_update_period":24}

1
linux-live/modules/03-apps/rootcopy/etc/cts/user_registration_info.json
View File

@ -0,0 +1 @@
{"city":"","configVersion":1,"department":"","email":"","firstName":"","host":"cap","lastName":"","middleName":"","organization":"","protectionClass":"KC1"}

BIN
linux-live/modules/03-apps/rootcopy/root/cts-4.0.0-104.ks1_amd64.deb
View File

Binary file not shown.

17
linux-live/modules/03-apps/rootcopy/usr/share/applications/RDWebAccess.desktop
View File

@ -0,0 +1,17 @@
[Desktop Entry]
Version=1.0
Name=RD Web Access
Name[ru]=Веб-доступ к удаленным рабочим столам
GenericName=Remote Desktop Web Access
GenericName[ru]=Веб-доступ к удаленным рабочим столам
X-GNOME-FullName=Remote Desktop Web
Comment=RemoteApp and Desktop Connection
Comment[ru]=Подключение к удаленным рабочим столам и приложениям RemoteApp
Exec=/opt/google/chrome/google-chrome --profile-directory=Default --app="https://rd.niitnn.tn.corp/RDWeb"
Icon=preferences-desktop-remote-desktop
Terminal=false
Type=Application
Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
Keywords=remote desktop;rdp
Path=
StartupNotify=false

17
linux-live/modules/03-apps/rootcopy/usr/share/applications/RDWebClient.desktop
View File

@ -0,0 +1,17 @@
[Desktop Entry]
Version=1.0
Name=RD Web Client
Name[ru]=Веб-клиент удаленных рабочих столов
GenericName=Remote Desktop Web Client
GenericName[ru]=Веб-клиент доступа к удаленным рабочим столам
X-GNOME-FullName=Remote Desktop Web
Comment=RemoteApp and Desktop Connection
Comment[ru]=Подключение к удаленным рабочим столам и приложениям RemoteApp
Exec=/opt/google/chrome/google-chrome --profile-directory=Default --app="https://rd.niitnn.tn.corp/RDWeb/WebClient"
Icon=/usr/share/icons/hicolor/apps/microsoft-remote-desktop.png
Terminal=false
Type=Application
Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
Keywords=remote desktop;rdp
Path=
StartupNotify=false

BIN
linux-live/modules/03-apps/rootcopy/usr/share/icons/hicolor/apps/microsoft-remote-desktop.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

4
linux-live/modules/04-drivers/package.list
View File

@ -0,0 +1,4 @@
linux-headers-generic-hwe-20.04
virtualbox-guest-dkms
virtualbox-guest-utils
bcmwl-kernel-source

4
linux-live/pkglists/ubuntu-other.list
View File

@ -8,6 +8,6 @@ gparted
gsmartcontrol
xfce4-taskmanager
xfce4-xkb-plugin
firefox
firefox-locale-ru
#firefox
#firefox-locale-ru
language-pack-gnome-ru
Write Preview
Loading…
Cancel
Save