Commits (9)
## MAIN LINSTALLER CONFIGURATION FILE FOR VSIDO
[linstaller:extends]
source = vsido-base
# Do not ask for language, use the system's one instead.
#[module:language]
#ask = False
# Do not ask for timezone, use the system's one instead.
#[module:timezone]
#ask = False
# Disable root
#[module:userhost]
#root = None
## BASE LINSTALLER CONFIGURATION FILE FOR VSIDO -- END USER WILL NOT (HOPEFULLY) NEED THIS
[linstaller]
distribution = VSIDO
modules = uefidetect.inst welcome.front language.front timezone.front userhost.front partdisks.front bootloader.front summary.front partdisks.inst unsquash.inst virtualpartitions.inst language.inst timezone.inst network.inst supportrepo.inst bootloader.inst userhost.inst debian.inst clean.inst fstab.inst finish.inst end.front
special = partdisks.inst unsquash.inst virtualpartitions.inst
[module:language]
ask = True
[module:timezone]
ask = True
timezone = Etc/GMT
[module:partdisks]
swap_noformat = True
[module:unsquash]
image = /lib/live/mount/medium/live/filesystem.squashfs
[module:debian]
remove = /etc/linstaller/trios.packages-remove
autoremove = True
[module:bootloader]
bootloader = grub
grub_cmdline_linux = net.ifaces=0
should_hide_menu = False
install_refind = False
[module:supportrepo]
path = file:///lib/live/mount/medium/support
binarydir = ./
[module:network]
custom_net_ifaces = /etc/linstaller/vsido-net-interfaces
[module:fstab]
efi_part_mount_opts = x-systemd.automount,x-systemd.device-timeout=2
auto lo
iface lo inet loopback
# The primary network interface
allow-hotplug eth0
iface eth0 inet dhcp
......@@ -112,6 +112,7 @@ Package: linstaller-config-trios
Architecture: all
Depends: linstaller (= ${binary:Version}),
linstaller-modules-base (= ${binary:Version})
Conflicts: linstaller-config-vsido
Description: Modular GNU/Linux distribution installer -- trios configuration
linstaller is a modular and preseedable GNU/Linux distribution
installer, written in python.
......@@ -120,7 +121,22 @@ Description: Modular GNU/Linux distribution installer -- trios configuration
system, can be adapted to many Live distributions.
.
This package contains the linstaller configuration files to
install Semplice Linux.
install TRIOS Linux.
Package: linstaller-config-vsido
Architecture: all
Depends: linstaller (= ${binary:Version}),
linstaller-modules-base (= ${binary:Version})
Conflicts: linstaller-config-trios
Description: Modular GNU/Linux distribution installer -- trios configuration
linstaller is a modular and preseedable GNU/Linux distribution
installer, written in python.
.
It is Semplice Linux-oriented, but thanks to its configuration
system, can be adapted to many Live distributions.
.
This package contains the linstaller configuration files to
install VSIDO Linux.
Package: linstaller-modules-bricks
Architecture: all
......
/etc/linstaller/vsido
/etc/linstaller/vsido-base
/etc/linstaller/vsido-net-interfaces
#!/bin/sh
set -e
if [ ! -h /etc/linstaller/default ]; then
ln -s /etc/linstaller/vsido /etc/linstaller/default
else
:
exit
fi
......@@ -5,7 +5,7 @@ Name[sr@latin]=Instaliraj TRIOS
Comment=Launch the TRIOS installation wizard.
Comment[sr]=Покрени ТРИОС инсталациони програм
Comment[sr@latin]=Pokreni TRIOS instalacioni program
Exec=linstaller_crash_wrapper.sh -c=trios -f=glade start
Exec=linstaller_crash_wrapper.sh -f=glade start
Icon=gtk-save
Terminal=false
Type=Application
......
......@@ -443,6 +443,14 @@ def delete_partition(obj):
# Remove this partition
return disk.deletePartition(obj)
def check_disk_label_name_support(obj):
""" Checks if disk labels support partition names. """
disk = disks[os.path.basename(return_device(obj.path))]
if disk.supportsFeature(p.DISK_TYPE_PARTITION_NAME):
return True
else:
return False
def get_supported_filesystems():
""" Returns a list of supported filesystems. """
......
......@@ -5,7 +5,7 @@
# This is a module of linstaller, should not be executed as a standalone application.
####
VERSION = "7.0.6"
VERSION = "7.0.8"
####
import os, sys, traceback
......
......@@ -82,7 +82,11 @@ proc /proc proc defaults 0 0
filesystem = "swap"
elif filesystem == "vfat":
# FAT partition, needs special opts.
opts = "auto,users,rw,quiet,umask=000,shortname=lower"
efi_opts = self.moduleclass.settings["efi_part_mount_opts"]
if mountpoint in "/boot/efi" and efi_opts:
opts = ("auto,users,rw,quiet,umask=000,shortname=lower,%s" % efi_opts)
else:
opts = "auto,users,rw,quiet,umask=000,shortname=lower"
else:
# Normal partition.
opts = "defaults"
......@@ -176,4 +180,4 @@ class Module(module.Module):
""" Cache settings. """
self.cache("zram",True)
self.cache("efi_part_mount_opts",False)
......@@ -2640,7 +2640,7 @@ class Frontend(glade.Frontend):
name.append(self.distribs[path])
if (path in crypt.LUKSdevices or "crypt" in self.changed[path]["changes"]) and not "format" in self.changed[path]["changes"] and not ("PVcreate" in self.changed[path]["changes"] and not "crypt" in self.changed[path]["changes"]):
name.append("Encrypted partition")
elif name and part.name:
elif name and lib.check_disk_label_name_support(part):
name.append(part.name)
elif not path in self.distribs or path in self.previously_changed or self.changed[path]["changes"] != {}:
name.append("Normal partition")
......
......@@ -48,14 +48,14 @@ def search_for_glade():
data, symlinks = search_for_glade()
data_files = [
("/usr/bin", ["linstaller_wrapper.sh", "linstaller_crash_wrapper.sh", "session/linstaller_session.sh", "mount_nolive.sh", "copy-install-log.sh"]),
("/etc/linstaller", ["config/trios", "config/trios-base", "config/refind-inst.sh"]),
("/etc/linstaller", ["config/trios", "config/trios-base", "config/refind-inst.sh", "config/vsido", "config/vsido-base", "config/vsido-net-interfaces"]),
("/usr/share/applications", ["linstaller.desktop"]),
("/usr/share/xsessions", ["session/linstaller.desktop"]),
]
data_files += data
distrib = setup(name='linstaller',
version='7.0.6',
version='7.0.8',
description='Modular, preseedable, GNU/Linux distribution installer',
author='Eugenio Paolantonio and the Semplice Team',
author_email='me@medesimo.eu',
......