Merge branch 'master' into acaqb

This commit is contained in:
Yorick Barbanneau 2018-05-02 10:34:03 +02:00
commit 5c6608d420

View file

@ -83,7 +83,7 @@ create_fusioninv_conf () {
} }
configure_drm(){ configure_drm(){
if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ] if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ]
then then
cat "drm" >> $INITRAMFS_CONF_FILE cat "drm" >> $INITRAMFS_CONF_FILE
else else
@ -103,7 +103,7 @@ configure_grub (){
} }
configure_plymouth (){ configure_plymouth (){
local module=$(lsmod | grep -o "i915\|radeon" | head -1) local module=$(lsmod | grep -o "i915\|radeon" | head -1)
if [ ! "$module" == "" ] if [ ! "$module" == "" ]
then then
message "\nConfigure drm modules for $module : " message "\nConfigure drm modules for $module : "
@ -116,14 +116,15 @@ configure_plymouth (){
message "\nSelect plymouth theme : " message "\nSelect plymouth theme : "
plymouth-set-default-theme -R spinner &>/dev/null plymouth-set-default-theme -R spinner &>/dev/null
message "done" "ok" message "done" "ok"
message "\n" message "\n"
else else
message "\nNo suitable kernel module found for plymouth\n" "warn" message "\nNo suitable kernel module found for plymouth\n" "warn"
fi fi
} }
message "\nAdd Debian Sid Repository :" message "\nAdd Debian stretch backport and Sid Repository :"
cp ./files/apt/10.sid.list /etc/apt/sources.list.d/ cp ./files/apt/10.stretch_backport.list /etc/apt/sources.list.d/
cp ./files/apt/20.sid.list /etc/apt/sources.list.d/
cp ./files/apt/20-stable /etc/apt/preferences.d/ cp ./files/apt/20-stable /etc/apt/preferences.d/
cp ./files/apt/80-fusioninventory /etc/apt/preferences.d/ cp ./files/apt/80-fusioninventory /etc/apt/preferences.d/
cp ./files/apt/80-papirus-icon-theme /etc/apt/preferences.d/ cp ./files/apt/80-papirus-icon-theme /etc/apt/preferences.d/