diff --git a/conf/fusioninventory.conf b/conf/fusioninventory.conf deleted file mode 100644 index ecedca7..0000000 --- a/conf/fusioninventory.conf +++ /dev/null @@ -1,4 +0,0 @@ -FI_SERVER="https://agent.dg.acaqb.net/" -FI_PROXY_USER="agent" -FI_PROXY_PASS="kE9TDtP63xwK" -FI_CONF_FILE="/etc/fusioninventory/agent.cfg" diff --git a/files/apt/60-libreoffice b/files/apt/60-libreoffice index 2ecfef3..2ac3c54 100644 --- a/files/apt/60-libreoffice +++ b/files/apt/60-libreoffice @@ -1,3 +1,3 @@ -Package: ~/libreoffice/ +Package: libreoffice libreoffice-gtk3 libreoffice-l10n-fr Pin: release n=stretch-backports Pin-Priority: 991 diff --git a/files/apt/60-remmina b/files/apt/60-remmina index 1662356..f15a097 100644 --- a/files/apt/60-remmina +++ b/files/apt/60-remmina @@ -1,3 +1,3 @@ Package: remmina remmina-plugin-rdp -Pin: release n=stretch-backports +in: release n=stretch-backports Pin-Priority: 991 diff --git a/files/packages.list b/files/packages.list index ca766ed..e3c43c9 100644 --- a/files/packages.list +++ b/files/packages.list @@ -3,9 +3,6 @@ pulseaudio unzip unattended-upgrades -apt-listchanges -exfat-utils -ntfs-3g # Desktop xorg @@ -24,7 +21,6 @@ xfce4-systemload-plugin thunar-archive-plugin gnome-system-tools gnome-disk-utility -gnome-keyring plank #Printing @@ -57,8 +53,6 @@ thunderbird thunderbird-l10n-fr vlc vlc-l10n -remmina -remmina-plugin-rdp #FI Agent fusioninventory-agent diff --git a/install.sh b/install.sh index 59c3c94..13bd2a0 100755 --- a/install.sh +++ b/install.sh @@ -82,22 +82,22 @@ create_fusioninv_conf () { } configure_drm(){ - if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ] + if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ] then - echo "drm" >> $INITRAMFS_CONF_FILE + cat "drm" >> $INITRAMFS_CONF_FILE else message "DRM already done " "warn" fi if [ -z "$(grep -o $1 $INITRAMFS_CONF_FILE)" ] then - echo "$1 modeset=1" >> $INITRAMFS_CONF_FILE + cat "$1 modeset=1" >> $INITRAMFS_CONF_FILE else message "$1 already done " "warn" fi } configure_grub (){ - sed -Ei "s/^GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 splash\"/g" ${GRUB_DEFAULT_CONF_FILE} >/dev/null + sed -E "s/^GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 spash\"/g" ${GRUB_DEFAULT_CONF_FILE} >/dev/null update-grub2 2>/dev/null } @@ -154,10 +154,6 @@ message "\nCreate users default parameters : " cp -R files/skel/ /etc/ &> /dev/null message "OK" "ok" -message "\nConfigure fusioninventory" -create_fusioninv_conf -message "OK" "ok" - #remove interface file until NM use network rm -rf /etc/network/interfaces