From e39757e142c8f510a0b013aba33a8555075ddf16 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sun, 27 May 2018 20:51:05 +0200 Subject: [PATCH] Packages cleanup. Removing deprecated configs and scripts --- .../etc/lightdm/lightdm-gtk-greeter.conf | 9 ------ .../lightdm/lightdm.conf.d/11-armbian.conf | 5 --- .../bsp/common/etc/network/interfaces.bonding | 24 -------------- .../common/etc/network/interfaces.espressobin | 4 --- .../bsp/common/etc/network/interfaces.hostapd | 12 ------- .../etc/network/interfaces.network-manager | 6 ---- packages/bsp/common/etc/network/interfaces.r1 | 21 ------------ .../common/etc/network/interfaces.r1router | 28 ---------------- .../common/etc/network/interfaces.r1switch | 16 ---------- .../usr/share/chromium/initial_bookmarks.html | 14 -------- .../usr/share/chromium/master_preferences | 32 ------------------- 11 files changed, 171 deletions(-) delete mode 100644 packages/bsp/common/etc/lightdm/lightdm-gtk-greeter.conf delete mode 100644 packages/bsp/common/etc/lightdm/lightdm.conf.d/11-armbian.conf delete mode 100644 packages/bsp/common/etc/network/interfaces.bonding delete mode 100644 packages/bsp/common/etc/network/interfaces.espressobin delete mode 100644 packages/bsp/common/etc/network/interfaces.hostapd delete mode 100644 packages/bsp/common/etc/network/interfaces.network-manager delete mode 100644 packages/bsp/common/etc/network/interfaces.r1 delete mode 100644 packages/bsp/common/etc/network/interfaces.r1router delete mode 100644 packages/bsp/common/etc/network/interfaces.r1switch delete mode 100644 packages/bsp/common/usr/share/chromium/initial_bookmarks.html delete mode 100644 packages/bsp/common/usr/share/chromium/master_preferences diff --git a/packages/bsp/common/etc/lightdm/lightdm-gtk-greeter.conf b/packages/bsp/common/etc/lightdm/lightdm-gtk-greeter.conf deleted file mode 100644 index e6cc8e319c..0000000000 --- a/packages/bsp/common/etc/lightdm/lightdm-gtk-greeter.conf +++ /dev/null @@ -1,9 +0,0 @@ -[greeter] -background = #888a85 -theme-name = Numix -icon-theme-name = Numix -default-user-image=/usr/share/pixmaps/armbian.png -indicators = ~language;~power -screensaver-timeout = 0 -font-name = Sans 11 -user-background = false \ No newline at end of file diff --git a/packages/bsp/common/etc/lightdm/lightdm.conf.d/11-armbian.conf b/packages/bsp/common/etc/lightdm/lightdm.conf.d/11-armbian.conf deleted file mode 100644 index 9b14b9557a..0000000000 --- a/packages/bsp/common/etc/lightdm/lightdm.conf.d/11-armbian.conf +++ /dev/null @@ -1,5 +0,0 @@ -[SeatDefaults] -user-session=ubuntu -greeter-show-manual-login=false -greeter-hide-users=false -allow-guest=false diff --git a/packages/bsp/common/etc/network/interfaces.bonding b/packages/bsp/common/etc/network/interfaces.bonding deleted file mode 100644 index 3c291139ea..0000000000 --- a/packages/bsp/common/etc/network/interfaces.bonding +++ /dev/null @@ -1,24 +0,0 @@ -auto eth0 -iface eth0 inet manual - bond-master bond0 - bond-primary eth0 - bond-mode active-backup - -auto wlan0 -iface wlan0 inet manual - wpa-ssid your_SSID - wpa-psk xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - - # to generate proper encrypted key: wpa_passphrase your_SSID your_password - - bond-master bond0 - bond-primary eth0 - bond-mode active-backup - -# Define master -auto bond0 -iface bond0 inet dhcp - bond-slaves none - bond-primary eth0 - bond-mode active-backup - bond-miimon 100 diff --git a/packages/bsp/common/etc/network/interfaces.espressobin b/packages/bsp/common/etc/network/interfaces.espressobin deleted file mode 100644 index 7ecc8cbca3..0000000000 --- a/packages/bsp/common/etc/network/interfaces.espressobin +++ /dev/null @@ -1,4 +0,0 @@ -source /etc/network/interfaces.d/* -# interfaces(5) file used by ifup(8) and ifdown(8) -auto lo -iface lo inet loopback diff --git a/packages/bsp/common/etc/network/interfaces.hostapd b/packages/bsp/common/etc/network/interfaces.hostapd deleted file mode 100644 index 6e357430b0..0000000000 --- a/packages/bsp/common/etc/network/interfaces.hostapd +++ /dev/null @@ -1,12 +0,0 @@ -auto lo br0 -iface lo inet loopback - -auto eth0 -iface eth0 inet manual - -auto wlan0 -iface wlan0 inet manual - -iface br0 inet dhcp -bridge_ports eth0 wlan0 -#hwaddress ether # will be added at first boot diff --git a/packages/bsp/common/etc/network/interfaces.network-manager b/packages/bsp/common/etc/network/interfaces.network-manager deleted file mode 100644 index 200c97b6a3..0000000000 --- a/packages/bsp/common/etc/network/interfaces.network-manager +++ /dev/null @@ -1,6 +0,0 @@ -source /etc/network/interfaces.d/* - -# This file intentionally left blank -# -# All interfaces are handled by network-manager, use nmtui or nmcli on -# server/headless images or the "Network Manager" GUI on desktop images diff --git a/packages/bsp/common/etc/network/interfaces.r1 b/packages/bsp/common/etc/network/interfaces.r1 deleted file mode 100644 index 06530a44a7..0000000000 --- a/packages/bsp/common/etc/network/interfaces.r1 +++ /dev/null @@ -1,21 +0,0 @@ -auto lo -iface lo inet loopback - -auto eth0.101 -iface eth0.101 inet manual - pre-up swconfig dev eth0 set reset 1 - pre-up swconfig dev eth0 set enable_vlan 1 - pre-up swconfig dev eth0 vlan 101 set ports '3 8t' - pre-up swconfig dev eth0 set apply 1 - -auto eth0.102 -iface eth0.102 inet manual - pre-up swconfig dev eth0 vlan 102 set ports '0 1 2 4 8t' - pre-up swconfig dev eth0 set apply 1 - -auto wlan0 -iface wlan0 inet manual - -auto br0 -iface br0 inet dhcp -bridge_ports eth0.101 wlan0 diff --git a/packages/bsp/common/etc/network/interfaces.r1router b/packages/bsp/common/etc/network/interfaces.r1router deleted file mode 100644 index a16dece2df..0000000000 --- a/packages/bsp/common/etc/network/interfaces.r1router +++ /dev/null @@ -1,28 +0,0 @@ -auto lo -iface lo inet loopback - -auto eth0.101 -iface eth0.101 inet manual - pre-up swconfig dev eth0 set reset 1 - pre-up swconfig dev eth0 set enable_vlan 1 - pre-up swconfig dev eth0 vlan 101 set ports '3 8t' - pre-up swconfig dev eth0 set apply 1 - -auto eth0.102 -iface eth0.102 inet manual - pre-up swconfig dev eth0 vlan 102 set ports '0 1 2 4 8t' - pre-up swconfig dev eth0 set apply 1 - -allow-hotplug wlan0 -iface wlan0 inet manual - -# WAN -auto eth0.101 -iface eth0.101 inet dhcp - -# LAN -auto br0 -iface br0 inet static -bridge_ports eth0.102 wlan0 - address 192.168.2.254 - netmask 255.255.255.0 diff --git a/packages/bsp/common/etc/network/interfaces.r1switch b/packages/bsp/common/etc/network/interfaces.r1switch deleted file mode 100644 index fd5be5c28d..0000000000 --- a/packages/bsp/common/etc/network/interfaces.r1switch +++ /dev/null @@ -1,16 +0,0 @@ -auto lo -iface lo inet loopback - -auto eth0.101 -iface eth0.101 inet manual - pre-up swconfig dev eth0 set reset 1 - pre-up swconfig dev eth0 set enable_vlan 1 - pre-up swconfig dev eth0 vlan 101 set ports '0 1 2 3 4 8t' - pre-up swconfig dev eth0 set apply 1 - -auto wlan0 -iface wlan0 inet manual - -auto br0 -iface br0 inet dhcp -bridge_ports eth0.101 wlan0 diff --git a/packages/bsp/common/usr/share/chromium/initial_bookmarks.html b/packages/bsp/common/usr/share/chromium/initial_bookmarks.html deleted file mode 100644 index c2677a2ea9..0000000000 --- a/packages/bsp/common/usr/share/chromium/initial_bookmarks.html +++ /dev/null @@ -1,14 +0,0 @@ - - -Bookmarks -

Bookmarks

-

-

Bookmarks Bar

-

-

armbian -
+documentation -
+guides -
+news -
+donate -

-

diff --git a/packages/bsp/common/usr/share/chromium/master_preferences b/packages/bsp/common/usr/share/chromium/master_preferences deleted file mode 100644 index 9e2eef8305..0000000000 --- a/packages/bsp/common/usr/share/chromium/master_preferences +++ /dev/null @@ -1,32 +0,0 @@ -{ - "distribution": { - "import_bookmarks": false, - "import_bookmarks_from_file": "/usr/share/chromium/initial_bookmarks.html", - "skip_first_run_ui": true, - "show_welcome_page": false, - "suppress_first_run_default_browser_prompt": true, - "suppress_first_run_bubble": true, - "make_chrome_default": false, - "make_chrome_default_for_user": false, - "create_all_shortcuts": true, - "show_welcome_page": false - }, - "first_run_tabs": [ - "https://www.armbian.com/donate" - ], - "browser": { - "show_home_button": true, - "check_default_browser" : false - }, - "bookmark_bar": { - "show_on_all_tabs": true - }, - "safebrowsing": { - "enabled": false - }, - "alternate_error_pages": { - "enabled": false - }, - "homepage": "https://www.armbian.com", - "AudioCaptureAllowed" : false -}