Compare commits

...

21 commits

Author SHA1 Message Date
Philip
a0986ae472 [util-iso-image] fix thus.conf port for v0.13 2016-12-15 21:07:26 +01:00
udeved
83de201055 util-iso-image: configure thus for sonar 2016-12-05 20:18:29 +01:00
Philip
53b3ce5dc1 [util-yaml] lower value 'requiredStorage' to 7.9 GiB
- this might satisfy Windows-Klicki-Bunti users
- however we should create a more dynamic approach and calculate the real need of space
2016-11-23 19:44:31 +01:00
Philip
bdf55196c3 [util-yaml] higher 'requiredStorage' to 8.0 GiB
- see also: https://bugs.manjaro.org/index.php?do=details&task_id=95
- we might need a more dynamic approach and also think about NetInstall
2016-11-22 08:05:33 +01:00
udeved
26cca31fb1 Merge branch 'master' of github.com:manjaro/manjaro-tools into stable-0.13.x 2016-09-30 23:17:08 +02:00
udeved
2a3c20e3a9 Merge branch 'master' of github.com:manjaro/manjaro-tools into stable-0.13.x 2016-09-30 15:30:46 +02:00
udeved
ef9d9e34fa Merge branch 'master' of github.com:manjaro/manjaro-tools into stable-0.13.x 2016-09-28 15:42:11 +02:00
udeved
f2d646b371 Merge branch 'master' of github.com:manjaro/manjaro-tools into stable-0.13.x 2016-09-18 15:54:28 +02:00
udeved
b4389f1c06 start 0.13.7 2016-09-18 15:54:10 +02:00
Philip
0c40ad7d35 bump 2016-09-10 22:07:07 +02:00
Philip
0d61fc0869 Merge branch 'master' into stable-0.13.x 2016-09-10 22:06:49 +02:00
Philip
9b478fdc2e bump 2016-08-28 13:35:54 +02:00
Philip
c61f1ac9ba Merge branch 'master' into stable-0.13.x 2016-08-28 13:35:40 +02:00
Philip
c99ffacc8e bump 2016-08-21 10:00:10 +02:00
Philip
0990d44bf4 Merge branch 'master' into stable-0.13.x 2016-08-21 09:59:46 +02:00
Philip
c5c8c5e5ff bump 2016-08-18 21:53:53 +02:00
Philip
31970d78a2 Merge branch 'master' into stable-0.13.x 2016-08-18 21:53:29 +02:00
Philip
360da72fc6 bump 2016-08-06 09:34:02 +02:00
Philip
3a37521eed Merge branch 'master' into stable-0.13.x 2016-08-06 09:29:04 +02:00
Philip
4d6b18c660 v0.13.1 2016-08-03 07:21:20 +02:00
Bernhard Landauer
0f7ba32e56 [util-iso-image] qt vars: add deepin, avoid double entry 2016-08-01 22:27:37 +02:00
2 changed files with 25 additions and 1 deletions

View file

@ -194,6 +194,29 @@ configure_system(){
esac
}
configure_thus(){
msg2 "Configuring Thus ..."
source "$1/etc/mkinitcpio.d/${kernel}.preset"
local conf="$1/etc/thus.conf"
echo "[distribution]" > "$conf"
echo "DISTRIBUTION_NAME = \"${dist_name} Linux\"" >> "$conf"
echo "DISTRIBUTION_VERSION = \"${dist_release}\"" >> "$conf"
echo "SHORT_NAME = \"${dist_name}\"" >> "$conf"
echo "[install]" >> "$conf"
echo "LIVE_MEDIA_SOURCE = \"/bootmnt/${iso_name}/${target_arch}/root-image.sqfs\"" >> "$conf"
echo "LIVE_MEDIA_DESKTOP = \"/bootmnt/${iso_name}/${target_arch}/${profile}-image.sqfs\"" >> "$conf"
echo "LIVE_MEDIA_TYPE = \"squashfs\"" >> "$conf"
echo "LIVE_USER_NAME = \"${username}\"" >> "$conf"
echo "KERNEL = \"${kernel}\"" >> "$conf"
echo "VMLINUZ = \"$(echo ${ALL_kver} | sed s'|/boot/||')\"" >> "$conf"
echo "INITRAMFS = \"$(echo ${default_image} | sed s'|/boot/||')\"" >> "$conf"
echo "FALLBACK = \"$(echo ${fallback_image} | sed s'|/boot/||')\"" >> "$conf"
if [[ -f $1/usr/share/applications/thus.desktop && -f $1/usr/bin/kdesu ]];then
sed -i -e 's|sudo|kdesu|g' $1/usr/share/applications/thus.desktop
fi
}
configure_live_image(){
msg "Configuring [live-image]"
configure_hosts "$1"
@ -202,6 +225,7 @@ configure_live_image(){
configure_system "$1"
configure_services "$1"
configure_calamares "$1"
[[ ${edition} == "sonar" ]] && configure_thus "$1"
write_live_session_conf "$1"
msg "Done configuring [live-image]"
}

View file

@ -173,7 +173,7 @@ write_welcome_conf(){
echo "showReleaseNotesUrl: true" >> "$conf"
echo '' >> "$conf"
echo "requirements:" >> "$conf"
echo " requiredStorage: 5.5" >> "$conf"
echo " requiredStorage: 7.9" >> "$conf"
echo " requiredRam: 1.0" >> "$conf"
echo " check:" >> "$conf"
echo " - storage" >> "$conf"