Changeset 9d437ac


Ignore:
Timestamp:
10/03/13 16:57:46 (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
8ebea8d
Parents:
a180dc7
Message:

When we remove the PBI make sure we unmount everything first, also
make sure to create fonts / cursors / icons dirs with X apps

Location:
src-sh/pbi-manager10
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager10/pbi-manager

    ra180dc7 r9d437ac  
    40974097                rm -rf ${PBI_STAGEDIR}/lib/X11/icons/* >/dev/null 2>/dev/null 
    40984098        fi 
     4099        if [ -e "${PBI_STAGEDIR}/lib/X11" ] ; then 
     4100                mkdir -p ${PBI_STAGEDIR}/lib/X11/icons/ >/dev/null 2>/dev/null 
     4101                mkdir -p ${PBI_STAGEDIR}/lib/X11/fonts/ >/dev/null 2>/dev/null 
     4102                mkdir -p ${PBI_STAGEDIR}/etc/fonts/ >/dev/null 2>/dev/null 
     4103        fi 
    40994104} 
    41004105 
     
    42944299        load_info_from_dir "${PBI_DBAPPDIR}/${PBI_DELETENAME}" 
    42954300        PBI_PROGDIRPATH="${PBI_ORIGPROGDIRPATH}" 
     4301 
     4302        # Unmount the PBI if its mounted 
     4303        /usr/pbi/.pbime umount "/usr/pbi/.mounts/`basename $PBI_PROGDIRPATH`" 
    42964304 
    42974305        get_username_from_file "${PBI_DBAPPDIR}/${PBI_DELETENAME}/pbi_name" 
  • src-sh/pbi-manager10/pbime/pbime.c

    r94b18f3 r9d437ac  
    5454        login_cap_t *lcap; 
    5555 
     56        /* Is this a request to unmount? */ 
     57        if ( argc == 3 ) { 
     58                if ( strcmp(argv[1], "umount") == 0 ) { 
     59                        strcpy(mountscript, "/usr/pbi/.pbimount umount "); 
     60                        strcat(mountscript, argv[2]); 
     61                        return system(mountscript); 
     62                } 
     63        } 
     64 
    5665        if (argc < 4) 
    5766                usage(); 
     67 
    5868        /* Get the current user ID and user name in the host system */ 
    5969        huid = getuid(); 
Note: See TracChangeset for help on using the changeset viewer.