Lubuntu
/
calamares-settings-ubuntu
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up Calamares settings.

Browse Source 
Summary:
This resolves T107

Refactor automirror

Add donate button url and geoip to welcome

Adjust locale.conf geoip format

Set default filesystem type and no user swap choices

Add defaults to settings to eliminate warnings

Add efi mount options to fstab.conf

Set restart mode in finished.conf to new style

Set bootloader entry name to Ubuntu and slideshowAPI to 1

Test Plan:
Test Calamares installation for proper location detection.

Test Calamares installation for proper efi mount.

Test Calamares installation for proper bootloader entry.

Reviewers: tsimonq2, wxl, apt-ghetto

Reviewed By: tsimonq2, wxl

Subscribers: apt-ghetto

Maniphest Tasks: T107

Differential Revision: https://phab.lubuntu.me/D33
ubuntu/focal ubuntu/19.10.4
Dan Simmons 5 years ago committed by Walter Lapchynski
parent 1a4f60968a
commit cd7fa92d15
17 changed files with 105 additions and 36 deletions
Show Stats Download Patch File Download Diff File

1
Makefile
Unescape View File

@ -5,7 +5,6 @@
all:
# Desktop file
(cd lubuntu/po/ && make)
chmod +x lubuntu/*.desktop
# Slideshow
(cd lubuntu/branding/lubuntu/lang/ && make)
# Get rid of the unnecessary files

4
common/modules/automirror/automirror.conf
Unescape View File

@ -5,7 +5,9 @@
baseUrl: archive.ubuntu.com
# URL used for IP address lookup
geoIpUrl: https://ipapi.co/json
geoip:
style: "json"
url: "https://ipapi.co/json"
# Distribution that this is based off of.
# This is so we can make safe assumptions for the contents of

38
common/modules/automirror/main.py
Unescape View File

@ -106,13 +106,13 @@ def getcountrycode():
an empty string.
"""
if libcalamares.globalstorage.value("hasInternet"):
geoipurl = libcalamares.job.configuration["geoIpUrl"]
geoipurl = libcalamares.job.configuration["geoip"]["url"]
try:
with urllib.request.urlopen(geoipurl, timeout=75) as url:
localedata = json.loads(url.read().decode())
except HTTPError as error:
logging.error("Data of %s not retrieved because %s - URL: %s",
name, error, url)
logging.error("Data not retrieved because %s - URL: %s",
error, url)
except URLError as error:
if isinstance(error.reason, socket.timeout):
logging.error("Socket timed out - URL %s", url)
@ -137,22 +137,22 @@ def getcodename():
def changesources(subdomain):
distro = libcalamares.job.configuration["distribution"]
url = "http://{}{}".format(subdomain,
libcalamares.job.configuration["baseUrl"])
global sources
sources = sources.replace("DISTRIBUTION", distro)
sources = sources.replace("CODENAME", getcodename())
sources = sources.replace("URL", url)
sources = sources.replace("DATE", strftime("%Y-%m-%d"))
filepath = libcalamares.globalstorage.value("rootMountPoint")
filepath += "/etc/apt/sources.list"
with open(filepath, "r+") as sourcesfile:
sourcesfile.seek(0)
sourcesfile.write(sources)
sourcesfile.truncate()
distro = libcalamares.job.configuration["distribution"]
url = "http://{}{}".format(subdomain,
libcalamares.job.configuration["baseUrl"])
global sources
sources = sources.replace("DISTRIBUTION", distro)
sources = sources.replace("CODENAME", getcodename())
sources = sources.replace("URL", url)
sources = sources.replace("DATE", strftime("%Y-%m-%d"))
filepath = libcalamares.globalstorage.value("rootMountPoint")
filepath += "/etc/apt/sources.list"
with open(filepath, "r+") as sourcesfile:
sourcesfile.seek(0)
sourcesfile.write(sources)
sourcesfile.truncate()
def run():

3
debian/calamares-settings-lubuntu.lintian-overrides vendored
Unescape View File

@ -0,0 +1,3 @@
# The .desktop file uses bash to run firefox as the local
# user. bash is included in the system.
calamares-settings-lubuntu: desktop-command-not-in-package usr/share/applications/lubuntu-calamares.desktop bash

38
debian/changelog vendored
Unescape View File

@ -1,3 +1,41 @@
calamares-settings-ubuntu (1:19.10.4) eoan; urgency=medium
[ Dan Simmons ]
* Bump Standards-Version to 4.4.0, no changes needed.
* Bump debhelper to 12, no changes needed.
* Adjust automirror config to new style. Change automirror module
to allow for new config style.
* Add setting for donate button in welcome.
* Add geoip for welcome.
* Adjust locale.conf to new geoip style.
* Set userSwapChoices to none in partition.conf.
* Set defaultFileSystemType to "ext4" in partition.conf.
* Set default dont-chroot, oem-setup, disable-cancel, to
eliminate warnings from settings.conf.
* Add efiMountOptions: umask=0077 to fstab.conf.
* Set restart mode to new style in finished.conf.
* Set bootloader entry name to Ubuntu.
* Set slide show API to 1 to eliminate warnings.
* Fix lintian errors and warnings.
- Add depends for python3 in calamares-settings-ubuntu-common.
- Adjust depends for calamares-settings-lubuntu.
- Add further description to extended description for
calamares-settings-lubuntu and calamares-settings-ubuntu.
- Add lintian override for bash in .desktop file.
- Remove unusual-interpreter in .desktop file.
- Adjust Makefile so .desktop file so it is not executable.
- Add keywords to .desktop file.
- Remove executable flag from automirror.conf and module.desc.
- Adjust debian/rules dpkg-architecture-variable.
[ apt-ghetto ]
* Fix small issues in automirror module
- Remove whitespace before index bracket.
- Remove undefined variable.
- Fix over-indented block.
-- Dan Simmons <kc2bez@lubuntu.me> Tue, 20 Aug 2019 19:59:12 -0400
calamares-settings-ubuntu (1:19.10.3) eoan; urgency=medium
* Short version name is eoan.

2
debian/compat vendored
Unescape View File

@ -1 +1 @@
11
12

18
debian/control vendored
Unescape View File

@ -3,21 +3,31 @@ Section: devel
Priority: optional
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
Build-Depends: debhelper (>= 11), intltool, qttools5-dev-tools
Standards-Version: 4.2.0
Build-Depends: debhelper (>= 12),
intltool,
qttools5-dev-tools
Standards-Version: 4.4.0
Homepage: https://code.launchpad.net/ubuntu-calamares-settings
Vcs-Git: https://git.launchpad.net/ubuntu-calamares-settings
Vcs-Browser: https://git.launchpad.net/ubuntu-calamares-settings
Package: calamares-settings-lubuntu
Architecture: all
Depends: calamares-settings-ubuntu-common (= ${binary:Version}),
Depends: calamares-settings-ubuntu-common (>= ${binary:Version}),
${misc:Depends}
Description: Lubuntu Calamares Settings and Branding
This package contains the Calamares settings and branding for Lubuntu.
As part of the branding the installer slideshow is contained within.
The settings ensure a proper Lubuntu desktop is installed with the
LXQt desktop environment.
Package: calamares-settings-ubuntu-common
Architecture: any
Depends: calamares, squashfs-tools, ${misc:Depends}
Depends: calamares,
squashfs-tools,
python3,
${misc:Depends}
Description: Common Calamares Settings
This package contains the common Calamares settings for all flavors.
There is also a automirror Python script to set sources based on
geolocation.

4
debian/rules vendored
Unescape View File

@ -1,6 +1,6 @@
#!/usr/bin/make -f
DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
%:
dh $@
@ -10,3 +10,5 @@ override_dh_missing:
mkdir -pv debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/calamares/modules
cp -vr common/modules/* debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/calamares/modules
chmod -R 755 debian/calamares-settings-ubuntu-common/usr/lib/
chmod 644 debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/calamares/modules/automirror/automirror.conf
chmod 644 debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/calamares/modules/automirror/module.desc

4
lubuntu/branding/lubuntu/branding.desc
Unescape View File

@ -10,7 +10,7 @@ strings:
shortVersion: eoan
versionedName: Lubuntu
shortVersionedName: Lubuntu 19.10
bootloaderEntryName: Lubuntu 19.10
bootloaderEntryName: Ubuntu
productUrl: https://lubuntu.me/
supportUrl: https://lubuntu.me/links/
@ -21,6 +21,8 @@ images:
slideshow: "show.qml"
slideshowAPI: 1
style:
sidebarBackground: "#808080"
sidebarText: "#FFFFFF"

2
lubuntu/lubuntu-calamares.desktop.in
Unescape View File

@ -1,4 +1,3 @@
#!/usr/bin/env xdg-open
[Desktop Entry]
Type=Application
Version=1.0
@ -10,3 +9,4 @@ Icon=calamares
Terminal=false
StartupNotify=true
Categories=Qt;System;
Keywords=installer;calamares;system;

4
lubuntu/modules/automirror.conf
Unescape View File

@ -1,4 +1,6 @@
---
baseUrl: archive.ubuntu.com
distribution: Lubuntu
geoIpUrl: https://ipapi.co/json
geoip:
style: "json"
url: "https://ipapi.co/json"

3
lubuntu/modules/finished.conf
Unescape View File

@ -1,4 +1,3 @@
---
restartNowChecked: true
restartNowEnabled: true
restartNowMode: user-checked
restartNowCommand: "systemctl -i reboot"

1
lubuntu/modules/fstab.conf
Unescape View File

@ -8,3 +8,4 @@ ssdExtraMountOptions:
swap: discard
btrfs: discard,compress=lzo
crypttabOptions: luks,keyscript=/bin/cat
efiMountOptions: umask=0077

7
lubuntu/modules/locale.conf
Unescape View File

@ -2,6 +2,7 @@
region: "America"
zone: "New_York"
localeGenPath: "/etc/locale.gen"
geoipUrl: "https://ipapi.co/json"
geoipStyle: "json"
geoipSelector: "timezone"
geoip:
style: "json"
url: "https://ipapi.co/json"
selector: "timezone"

3
lubuntu/modules/partition.conf
Unescape View File

@ -1,4 +1,5 @@
efiSystemPartition: "/boot/efi"
enableLuksAutomatedPartitioning: true
neverCreateSwap: true
userSwapChoices: none
drawNestedPartitions: true
defaultFileSystemType: "ext4"

5
lubuntu/modules/welcome.conf
Unescape View File

@ -2,6 +2,7 @@
showSupportUrl: true
showKnownIssuesUrl: true
showReleaseNotesUrl: true
showDonateUrl: https://lubuntu.me/donate/
requirements:
requiredStorage: 8
@ -18,3 +19,7 @@ requirements:
- root
- storage
- ram
geoip:
style: "json"
url: "https://ipapi.co/json"
selector: "country"

4
lubuntu/settings.conf
Unescape View File

@ -57,3 +57,7 @@ sequence:
branding: lubuntu
prompt-install: true
dont-chroot: false
oem-setup: false
disable-cancel: false
disable-cancel-during-exec: false

Write Preview
Loading…
Cancel
Save